From 3b359026764e78fa4589a1b48144a63bea3ec669 Mon Sep 17 00:00:00 2001
From: Merlin Mathesius <mmathesi@redhat.com>
Date: Aug 31 2017 17:04:57 +0000
Subject: Correct runtime NameError exception

Update to conform more closely to standard test interface playbook calling conventions
Fix environment setup and debug dumping

---

diff --git a/standard-interface-shim.py b/standard-interface-shim.py
index 5353d8c..550b8a3 100644
--- a/standard-interface-shim.py
+++ b/standard-interface-shim.py
@@ -54,17 +54,20 @@ def run_standard_interface_test(koji_build, rpms, workdir='.', artifactsdir='art
     inventory_filename = os.path.join(workdir, name, 'inventory')
     if os.path.exists(inventory_filename):
         environment['ANSIBLE_INVENTORY'] = inventory_filename
+    else:
+        environment['ANSIBLE_INVENTORY'] = '/usr/share/ansible/inventory'
 
-    environment['TEST_SUBJECTS'] = ','.join(rpms['downloaded_rpms'])
+    environment['TEST_SUBJECTS'] = ' '.join(rpms['downloaded_rpms'])
     environment['TEST_ARTIFACTS'] = artifactsdir
 
-    environment['PATH'] = '$PATH:/usr/bin:/usr/local/bin'
+    environment['HOME'] = os.environ.get('HOME', '/')
+    environment['PATH'] = os.environ.get('PATH', '') + ':/usr/bin:/usr/local/bin'
 
     # create the command
     testdir = os.path.join(workdir, name)
-    command = ['ansible-playbook', 'tests.yml']
+    command = ['ansible-playbook', '-e', 'artifacts='+artifactsdir, '--tags', 'classic', 'tests.yml']
 
-    log.debug("sending environment: ", environment)
+    log.debug("sending environment: {}".format(environment))
 
 
     # execute the tests
@@ -72,9 +75,13 @@ def run_standard_interface_test(koji_build, rpms, workdir='.', artifactsdir='art
     try:
         output, _ = os_utils.popen_rt(' '.join(command), shell=True, cwd=testdir, env=environment)
         returncode = 0
+        warnings = 0
+        errors = 0
     except subprocess.CalledProcessError as e:
         output = e.output
         returncode = e.returncode
+        warnings = 0
+        errors = 1
         outcome = 'FAILED'
 
         log.error("Command '{}' FAILED with exit code {}: ".format(' '.join(command), returncode, output))