Merge ~adam-collard/maas-ci/+git/system-tests:cog-refactor into ~maas-committers/maas-ci/+git/system-tests:master

[Adam Collard]

Minor refactor of cog sections to reuse code

[Jack Lloyd-Walters (lloydwaltersj)]

+1

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b cog-refactor lp:~adam-collard/maas-ci/+git/system-tests into -b master lp:~maas-committers/maas-ci/+git/system-tests

STATUS: SUCCESS
COMMIT: e6b98c785362dab71155711dc7649a95b8906765

review: Approve

diff --git a/tox.ini b/tox.ini
index b96b656..a1d75c5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,7 +29,15 @@ commands=
 #[[[cog
 #import cog
 #from pathlib import Path
+#import sys
 #import yaml
+## Used further down the file
+#if sys.version_info < (3, 9):
+#    print("Detected Python < 3.9; forcing basepython to 3.9")
+#    BASEPYTHON = "python3.9"
+#else:
+#    print("Detected Python >= 3.9, no basepython needed")
+#    BASEPYTHON = None
 #config_yaml = Path("config.yaml")
 #if config_yaml.exists():
 #    config = yaml.safe_load(config_yaml.open())
@@ -81,14 +89,8 @@ commands=
 
 [testenv:generate_config]
 #[[[cog
-#import cog
-#import sys
-#basepython = None
-#if sys.version_info < (3, 9):
-#    print("Detected Python < 3.9; forcing basepython to 3.9")
+#if BASEPYTHON:
 #    cog.outl("basepython = python3.9")
-#else:
-#    print("Detected Python >= 3.9, no basepython needed")
 #]]]
 #[[[end]]]
 description=Generate config.yaml
@@ -98,14 +100,8 @@ commands=python utils/gen_config.py {posargs}
 
 [testenv:filter_envs]
 #[[[cog
-#import cog
-#import sys
-#basepython = None
-#if sys.version_info < (3, 9):
-#    print("Detected Python < 3.9; forcing basepython to 3.9")
+#if BASEPYTHON:
 #    cog.outl("basepython = python3.9")
-#else:
-#    print("Detected Python >= 3.9, no basepython needed")
 #]]]
 #[[[end]]]
 description=Filter environments by valid tox ones.