From c2f376620c72fb72884fe351139f55458e65887d Mon Sep 17 00:00:00 2001
From: Maxwell G <gotmax@e.email>
Date: Mon, 11 Jul 2022 10:04:29 -0500
Subject: [PATCH] tests.yml: Test setting env vars in one place

---
 tests/tests.yml | 85 +++++++++++++++++++++++++------------------------
 1 file changed, 44 insertions(+), 41 deletions(-)

diff --git a/tests/tests.yml b/tests/tests.yml
index 460b4a1..0e28060 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -12,44 +12,47 @@
   - role: standard-test-basic
     tags:
     - classic
-    repositories:
-    - repo: "https://src.fedoraproject.org/tests/python.git"
-      dest: "python"
-    pybasever: "3.10"
-    tests:
-    - rpm_qa:
-        run: rpm -qa
-    - smoke:
-        dir: python/smoke
-        run: "VERSION={{ pybasever }} ./venv.sh"
-    - smoke_virtualenv:
-        dir: python/smoke
-        run: "VERSION={{ pybasever }} METHOD=virtualenv ./venv.sh"
-    - debugsmoke:
-        dir: python/smoke
-        run: "PYTHON=python{{ pybasever }}d TOX=false VERSION={{ pybasever }} ./venv.sh"
-    - selftest:
-        dir: python/selftest
-        run: "VERSION={{ pybasever }} X='' ./parallel.sh"
-    - debugtest:
-        dir: python/selftest
-        run: "VERSION={{ pybasever }} PYTHON=python{{ pybasever }}d X='' ./parallel.sh"
-    - debugflags:
-        dir: python/flags
-        run: "python{{ pybasever }}d ./assertflags.py -O0"
-    - marshalparser:
-        dir: python/marshalparser
-        run: "VERSION={{ pybasever }} SAMPLE=10 test_marshalparser_compatibility.sh"
-    required_packages:
-    - gcc  # for extension building in venv and selftest
-    - gdb  # for test_gdb
-    - "python{{ pybasever }}"  # the test subject
-    - "python{{ pybasever }}-debug"  # for leak testing
-    - "python{{ pybasever }}-devel"  # for extension building in venv and selftest
-    - "python{{ pybasever }}-tkinter"  # for selftest
-    - "python{{ pybasever }}-test"  # for selftest
-    - tox  # for venv tests
-    - virtualenv  # for virtualenv tests
-    - glibc-all-langpacks # for locale tests
-    - marshalparser  # for testing compatibility (magic numbers) with marshalparser
-    - rpm  # for debugging
+    vars:
+      repositories:
+      - repo: "https://src.fedoraproject.org/tests/python.git"
+        dest: "python"
+      pybasever: "3.10"
+      tests:
+      - rpm_qa:
+          run: rpm -qa
+      - smoke:
+          dir: python/smoke
+          run: "./venv.sh"
+      - smoke_virtualenv:
+          dir: python/smoke
+          run: "METHOD=virtualenv ./venv.sh"
+      - debugsmoke:
+          dir: python/smoke
+          run: "PYTHON=python{{ pybasever }}d TOX=false ./venv.sh"
+      - selftest:
+          dir: python/selftest
+          run: "X='' ./parallel.sh"
+      - debugtest:
+          dir: python/selftest
+          run: "PYTHON=python{{ pybasever }}d X='' ./parallel.sh"
+      - debugflags:
+          dir: python/flags
+          run: "python{{ pybasever }}d ./assertflags.py -O0"
+      - marshalparser:
+          dir: python/marshalparser
+          run: "SAMPLE=10 test_marshalparser_compatibility.sh"
+      required_packages:
+      - gcc  # for extension building in venv and selftest
+      - gdb  # for test_gdb
+      - "python{{ pybasever }}"  # the test subject
+      - "python{{ pybasever }}-debug"  # for leak testing
+      - "python{{ pybasever }}-devel"  # for extension building in venv and selftest
+      - "python{{ pybasever }}-tkinter"  # for selftest
+      - "python{{ pybasever }}-test"  # for selftest
+      - tox  # for venv tests
+      - virtualenv  # for virtualenv tests
+      - glibc-all-langpacks # for locale tests
+      - marshalparser  # for testing compatibility (magic numbers) with marshalparser
+      - rpm  # for debugging
+    environment:
+      VERSION: "{{ pybasever }}"