enh(ci): keep packages cache during plugins testing (#5321)

centreon · Dec 9, 2024 · 14b098c · 14b098c
1 parent 0135299
commit 14b098c
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/.github/docker/testing/Dockerfile.testing-plugins-bookworm b/.github/docker/testing/Dockerfile.testing-plugins-bookworm
@@ -18,6 +18,10 @@ EOF
 ENV LANG en_US.utf8
 
 RUN bash -e <<EOF
+
+# Avoid apt to clean packages cache directory
+rm -f /etc/apt/apt.conf.d/docker-clean
+
 apt-get update
 # Install Robotframework
 apt-get install -y python3-dev python3-pip

diff --git a/.github/docker/testing/Dockerfile.testing-plugins-bullseye b/.github/docker/testing/Dockerfile.testing-plugins-bullseye
@@ -18,6 +18,10 @@ EOF
 ENV LANG en_US.utf8
 
 RUN bash -e <<EOF
+
+# Avoid apt to clean packages cache directory
+rm -f /etc/apt/apt.conf.d/docker-clean
+
 apt-get update
 # Install Robotframework
 apt-get install -y python3 python3-dev python3-pip

diff --git a/.github/docker/testing/Dockerfile.testing-plugins-jammy b/.github/docker/testing/Dockerfile.testing-plugins-jammy
@@ -18,6 +18,10 @@ EOF
 ENV LANG en_US.utf8
 
 RUN bash -e <<EOF
+
+# Avoid apt to clean packages cache directory
+rm -f /etc/apt/apt.conf.d/docker-clean
+
 apt-get update
 # Install Robotframework
 apt-get install -y python3 python3-dev python3-pip

diff --git a/.github/scripts/test-all-plugins.py b/.github/scripts/test-all-plugins.py
@@ -74,8 +74,8 @@ def install_plugin(plugin, archi):
                     "apt-get install -o 'Binary::apt::APT::Keep-Downloaded-Packages=1;' -y ./" + plugin.lower() + "*.deb",
                 shell=True, check=False, stderr=subprocess.STDOUT, stdout=outfile)).returncode
         elif archi == "rpm":
-            outfile.write("dnf install -y ./" + plugin + "*.rpm\n")
-            output_status = (subprocess.run("dnf install -y ./" + plugin + "*.rpm", shell=True, check=False,
+            outfile.write("dnf install --setopt=keepcache=True -y ./" + plugin + "*.rpm\n")
+            output_status = (subprocess.run("dnf install --setopt=keepcache=True -y ./" + plugin + "*.rpm", shell=True, check=False,
                                         stderr=subprocess.STDOUT, stdout=outfile)).returncode
         else:
             print(f"Unknown architecture, expected deb or rpm, got {archi}. Exiting.")
@@ -95,8 +95,8 @@ def remove_plugin(plugin, archi):
             # 'autoremove', contrary to 'remove' all dependancy while removing the original package.
 
         elif archi == "rpm":
-            outfile.write("dnf remove -y " + plugin + "\n")
-            output_status = (subprocess.run("dnf remove -y " + plugin, shell=True, check=False,
+            outfile.write("dnf remove --setopt=keepcache=True -y " + plugin + "\n")
+            output_status = (subprocess.run("dnf remove --setopt=keepcache=True -y " + plugin, shell=True, check=False,
                                             stderr=subprocess.STDOUT, stdout=outfile)).returncode
         else:
             print(f"Unknown architecture, expected deb or rpm, got {archi}. Exiting.")

diff --git a/.github/workflows/docker-builder-testing-plugins.yml b/.github/workflows/docker-builder-testing-plugins.yml
@@ -23,22 +23,22 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - runner: ubuntu-22.04
+          - runner: ubuntu-24.04
             dockerfile: alma8
             image: alma8
-          - runner: ubuntu-22.04
+          - runner: ubuntu-24.04
             dockerfile: alma9
             image: alma9
-          - runner: ubuntu-22.04
+          - runner: ubuntu-24.04
             dockerfile: bullseye
             image: bullseye
           - runner: ["self-hosted", "collect-arm64"]
             dockerfile: bullseye
             image: bullseye-arm64
-          - runner: ubuntu-22.04
+          - runner: ubuntu-24.04
             dockerfile: bookworm
             image: bookworm
-          - runner: ubuntu-22.04
+          - runner: ubuntu-24.04
             dockerfile: jammy
             image: jammy