From 4225d6644ba3308638bb747fcab0f430bed40bee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Fri, 8 Jul 2022 10:27:42 +0000
Subject: [PATCH] CI tests config: Define and reuse the pybasever variable

This will make future changes easier to backport to other Python versions.

Note that with jinja2 expressions, we need to quote them to preserve valid yaml, see:
https://docs.ansible.com/ansible/latest/user_guide/playbooks_variables.html#when-to-quote-variables-a-yaml-gotcha
---
 tests/tests.yml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/tests/tests.yml b/tests/tests.yml
index 5a1bf68..460b4a1 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -15,38 +15,39 @@
     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=3.10 ./venv.sh
+        run: "VERSION={{ pybasever }} ./venv.sh"
     - smoke_virtualenv:
         dir: python/smoke
-        run: VERSION=3.10 METHOD=virtualenv ./venv.sh
+        run: "VERSION={{ pybasever }} METHOD=virtualenv ./venv.sh"
     - debugsmoke:
         dir: python/smoke
-        run: PYTHON=python3.10d TOX=false VERSION=3.10 ./venv.sh
+        run: "PYTHON=python{{ pybasever }}d TOX=false VERSION={{ pybasever }} ./venv.sh"
     - selftest:
         dir: python/selftest
-        run: VERSION=3.10 X="" ./parallel.sh
+        run: "VERSION={{ pybasever }} X='' ./parallel.sh"
     - debugtest:
         dir: python/selftest
-        run: VERSION=3.10 PYTHON=python3.10d X="" ./parallel.sh
+        run: "VERSION={{ pybasever }} PYTHON=python{{ pybasever }}d X='' ./parallel.sh"
     - debugflags:
         dir: python/flags
-        run: python3.10d ./assertflags.py -O0
+        run: "python{{ pybasever }}d ./assertflags.py -O0"
     - marshalparser:
         dir: python/marshalparser
-        run: VERSION=3.10 SAMPLE=10 test_marshalparser_compatibility.sh
+        run: "VERSION={{ pybasever }} SAMPLE=10 test_marshalparser_compatibility.sh"
     required_packages:
     - gcc  # for extension building in venv and selftest
     - gdb  # for test_gdb
-    - python3.10  # the test subject
-    - python3.10-debug  # for leak testing
-    - python3.10-devel  # for extension building in venv and selftest
-    - python3.10-tkinter  # for selftest
-    - python3.10-test  # for selftest
+    - "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