From b7fe09b20590a9c590e35b2185714cbbe4c94e3a Mon Sep 17 00:00:00 2001
From: git-hyagi <45576767+git-hyagi@users.noreply.github.com>
Date: Thu, 17 Oct 2024 11:14:40 -0300
Subject: [PATCH] test

---
 .ci/ansible/Containerfile.j2         | 5 ++++-
 .github/workflows/ci.yml             | 2 +-
 .github/workflows/scripts/install.sh | 1 +
 requirements.txt                     | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.ci/ansible/Containerfile.j2 b/.ci/ansible/Containerfile.j2
index e4b863331..194cff93b 100644
--- a/.ci/ansible/Containerfile.j2
+++ b/.ci/ansible/Containerfile.j2
@@ -1,4 +1,7 @@
-FROM {{ ci_base | default(pulp_default_container) }}
+#FROM {{ ci_base | default(pulp_default_container) }}
+FROM ghcr.io/pulp/pulp-ci-centos:3.45
+
+RUN dnf remove -y podman ; dnf install -y podman-3.3.1
 
 # Add source directories to container
 {% for item in plugins %}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1154575d0..66cee2fe5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ defaults:
 
 jobs:
   check-commits:
-    runs-on: "ubuntu-latest"
+    runs-on: "ubuntu-22.04"
     steps:
       - uses: "actions/checkout@v4"
         with:
diff --git a/.github/workflows/scripts/install.sh b/.github/workflows/scripts/install.sh
index 39da0d854..ee36079ed 100755
--- a/.github/workflows/scripts/install.sh
+++ b/.github/workflows/scripts/install.sh
@@ -155,6 +155,7 @@ if [[ "$TEST" = "azure" ]]; then
   az storage container create --name pulp-test --connection-string $AZURE_STORAGE_CONNECTION_STRING
 fi
 
+cmd_prefix bash -c "pip3 install plumbum==1.8.3 proxy.py==2.4.7"
 echo ::group::PIP_LIST
 cmd_prefix bash -c "pip3 list && pipdeptree"
 echo ::endgroup::
diff --git a/requirements.txt b/requirements.txt
index 18aeebad5..d0ff05a98 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 # remember to also update unittest_requirements.txt when updating this file
-pulpcore>=3.21.6,<3.25
+pulpcore==3.21.33,<3.25
 pyjwkest>=1.4,<=1.4.2
 pyjwt[crypto]>=2.4,<=2.5
 jsonschema>=4.4,<4.17