Merge ~adam-collard/maas-ci/+git/system-tests:generative-test-suites into ~maas-committers/maas-ci/+git/system-tests:master

[Adam Collard]

Use tox expansion to reduce DRY-violation

[MAAS Lander (maas-lander)]

UNIT TESTS
-b generative-test-suites lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: 4176e0eef1209227a39e1f1ff522bf9e8f421577

review: Approve

[Diego Mascialino (dmascialino)]

review: Approve

diff --git a/tox.ini b/tox.ini
index d1ba647..e340341 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py3,lint,mypy,build,cog
+envlist = cog,lint,mypy,build
 
 [testenv]
 passenv =
@@ -11,20 +11,13 @@ passenv =
   MAAS_SYSTEMTESTS_CLIENT_CONTAINER
   MAAS_SYSTEMTESTS_LXD_PROFILE
 
-commands=
-  pytest systemtests/tests {posargs}
-
 [testenv:build]
 commands=
   pytest systemtests/env_builder/ --maxfail=1 {posargs}
 
-[testenv:collect_sos_report]
-commands=
-  pytest systemtests/collect_sos_report --log-file systemtes.collect_sos_rport.log --junitxml=junit.collect_sos_report.xml {posargs}
-
-[testenv:general_tests]
+[testenv:{collect_sos_report,general_tests}]
 commands=
-  pytest systemtests/general_tests --log-file systemtes.generaltests.log --junitxml=junit.general_tests.xml {posargs}
+  pytest systemtests/{envname} --log-file systemtests.{envname}.log --junitxml=junit.{envname}.xml {posargs}
 
 [testenv:cog]
 deps=
@@ -40,11 +33,9 @@ commands=
 #machines = list(config.get("machines", {}).get("hardware", {}).keys())
 #machines += list(config.get("machines", {}).get("vms", {}).get("instances", {}).keys())
 #print("Generating config for {}.".format(', '.join(machines)))
-#for machine in machines:
-#    cog.outl(f'[testenv:{machine}]')
-#    cog.outl('commands=')
-#    cog.outl(f'  pytest systemtests/tests_per_machine -k "{machine}" --log-file systemtests.{machine}.log --junitxml=junit.{machine}.xml {{posargs}}')
-#    cog.outl("")
+#cog.outl(f"[testenv:{{{','.join(machines)}}}]")
+#cog.outl('commands=')
+#cog.outl('  pytest systemtests/tests_per_machine -k {envname} --log-file systemtests.{envname}.log --junitxml=junit.{envname}.xml {posargs}')
 #]]]
 #[[[end]]]