Put the pytest-forked back to attempt to unbreak ubi workflow

Signed-off-by: Jakub Jelen <[email protected]>
Jakuje · Dec 23, 2024 · ebc990b · ebc990b
1 parent aa93762
commit ebc990b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -1183,6 +1183,15 @@ jobs:
           && '4.0.0-2'
           || '2.6.0-1'
         }}${{ steps.distribution-meta.outputs.dist-tag }}.noarch.rpm
+        https://rpmfind.net/linux/epel/"$(
+          rpm --eval '%{rhel}'
+        )"/Everything/x86_64/Packages/p/python3-pytest-forked-${{
+          contains(matrix.target-container.tag, 'ubi9')
+          && '1.4.0'
+          || '1.0.2'
+        }}-1${{
+          steps.distribution-meta.outputs.dist-tag
+        }}.noarch.rpm
         https://rpmfind.net/linux/epel/"$(
           rpm --eval '%{rhel}'
         )"/Everything/x86_64/Packages/p/python3-pytest-xdist-${{

diff --git a/packaging/rpm/ansible-pylibssh.spec b/packaging/rpm/ansible-pylibssh.spec
@@ -56,6 +56,7 @@ Source14: %{pypi_source typing_extensions 4.12.2}
 %endif
 Source15: %{pypi_source pytest 6.2.4}
 Source16: %{pypi_source pytest-cov 2.12.1}
+Source17: %{pypi_source pytest-forked 1.3.0}
 Source18: %{pypi_source pytest-xdist 2.3.0}
 Source19: %{pypi_source iniconfig 1.1.1}
 Source20: %{pypi_source attrs 20.3.0}
@@ -76,6 +77,7 @@ BuildRequires: openssh-clients
 %if 0%{?rhel}
 BuildRequires: python3dist(pytest)
 BuildRequires: python3dist(pytest-cov)
+BuildRequires: python3dist(pytest-forked)
 BuildRequires: python3dist(pytest-xdist)
 BuildRequires: python3dist(tox)
 %endif
@@ -164,6 +166,8 @@ PYTHONPATH="$(pwd)/bin" \
 PYTHONPATH="$(pwd)/bin" \
 %{__python3} -m pip install --no-deps -t bin %{SOURCE16}
 PYTHONPATH="$(pwd)/bin" \
+%{__python3} -m pip install --no-deps -t bin %{SOURCE17}
+PYTHONPATH="$(pwd)/bin" \
 %{__python3} -m pip install --no-deps -t bin %{SOURCE18}
 PYTHONPATH="$(pwd)/bin" \
 %{__python3} -m pip install --no-deps -t bin %{SOURCE19}