log junit for each suite and platform

tests/kitchen/.kitchen.yml

@@ -80,5 +80,5 @@ suites:
 verifier:
   name: shell
   remote_exec: false
-  command: pytest -v tests/integration/$KITCHEN_SUITE
+  command: pytest --junit-xml <%= ENV['TEST_JUNIT_XML_PREFIX'] % [ENV['KITCHEN_SUITE'], ENV['KITCHEN_PLATFORM']] %> -v tests/integration/$KITCHEN_SUITE
 <% end %>

tests/kitchen/test_kitchen.py

@@ -38,7 +38,7 @@ def func_builder(testdir):
             'SALT_SDIST_PATH': os.path.join(self.topdir, 'dist', 'salt-{0}.tar.gz'.format(setup.__version__)),
         }
         if 'TESTS_XML_OUTPUT_DIR' in os.environ:
-            env['PYTEST_ADDOPTS'] = '--junit-xml {0}/kitchen.tests.{1}.xml'.format(
+            env['TEST_JUNIT_XML_PREFIX'] = '--junit-xml {0}/kitchen.tests.{1}.%s.%s.xml'.format(
                 os.environ.get('TESTS_XML_OUTPUT_DIR'),
                 testdir,
             )