From 5766dabfcf4b7d1d41dacd54672fa8c9e8bde64b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Wed, 14 Feb 2024 17:27:43 +0100
Subject: [PATCH] Make STI CI work: Drop other Pythons and pipenv, add EPEL,
 etc.

Not only are the removed Pythons not available in c9s,
testing with other Pythons is redundant
because only Python 3.9 uses the wheel built from this component.

pipenv was retired in Fedora and it was never branched for EPEL 9.

python3-tox was renamed to tox before it was added to EPEL 9.

EPEL is required to:
 - use mock
 - test integration with virtualenv and tox

Additionally, use c9s tests of pyproject-rpm-macros,
rawhide tests might use features not yet synced to c9s.
Don't run pyproject/clikit test, not enough dependencies in EPEL 9.
---
 tests/tests.yml | 59 +++++--------------------------------------------
 1 file changed, 5 insertions(+), 54 deletions(-)

diff --git a/tests/tests.yml b/tests/tests.yml
index 7946cb5..76c092e 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -7,56 +7,16 @@
     repositories:
     - repo: "https://src.fedoraproject.org/tests/python.git"
       dest: "python"
-    - repo: "https://src.fedoraproject.org/rpms/pyproject-rpm-macros.git"
+    - repo: "https://gitlab.com/redhat/centos-stream/rpms/pyproject-rpm-macros.git"
       dest: "pyproject-rpm-macros"
+      version: "c9s"
     tests:
-    - smoke34_optional:
-        dir: python/smoke
-        run: VERSION=3.4 INSTALL_OR_SKIP=true ./venv.sh
-    - smoke35:
-        dir: python/smoke
-        run: VERSION=3.5 ./venv.sh
-    - smoke36:
-        dir: python/smoke
-        run: VERSION=3.6 ./venv.sh
-    - smoke37:
-        dir: python/smoke
-        run: VERSION=3.7 ./venv.sh
-    - smoke38:
-        dir: python/smoke
-        run: VERSION=3.8 ./venv.sh
     - smoke39:
         dir: python/smoke
         run: VERSION=3.9 ./venv.sh
-    - smoke310:
-        dir: python/smoke
-        run: VERSION=3.10 ./venv.sh
-    - smoke27:
-        dir: python/smoke
-        run: VERSION=2.7 METHOD=virtualenv ./venv.sh
-    - smoke34_virtualenv_optional:
-        dir: python/smoke
-        run: VERSION=3.4 METHOD=virtualenv INSTALL_OR_SKIP=true ./venv.sh
-    - smoke35_virtualenv:
-        dir: python/smoke
-        run: VERSION=3.5 METHOD=virtualenv ./venv.sh
-    - smoke36_virtualenv:
-        dir: python/smoke
-        run: VERSION=3.6 METHOD=virtualenv ./venv.sh
-    - smoke37_virtualenv:
-        dir: python/smoke
-        run: VERSION=3.7 METHOD=virtualenv ./venv.sh
-    - smoke38_virtualenv:
-        dir: python/smoke
-        run: VERSION=3.8 METHOD=virtualenv ./venv.sh
     - smoke39_virtualenv:
         dir: python/smoke
         run: VERSION=3.9 METHOD=virtualenv ./venv.sh
-    - smoke310_virtualenv:
-        dir: python/smoke
-        run: VERSION=3.10 METHOD=virtualenv ./venv.sh
-    - pipenv:
-        run: pipenv --three && pipenv install six
     - pyproject_pytest:
         dir: pyproject-rpm-macros/tests
         run: ./mocktest.sh python-pytest
@@ -66,24 +26,15 @@
     - pyproject_pluggy:
         dir: pyproject-rpm-macros/tests
         run: ./mocktest.sh python-pluggy
-    - pyproject_clikit:
-        dir: pyproject-rpm-macros/tests
-        run: ./mocktest.sh python-clikit
     - pip_install_upgrade
     required_packages:
+    - 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm'
+    - 'https://dl.fedoraproject.org/pub/epel/epel-next-release-latest-9.noarch.rpm'
     - gcc
     - virtualenv
-    - python2.7
-    - python3.5
-    - python3.6
-    - python3.7
-    - python3.8
     - python3.9
-    - python3.10
-    - python2-devel
     - python3-devel
-    - python3-tox
-    - pipenv
+    - tox
     - mock
     - rpmdevtools
     - rpm-build