qa/distros: pass --allowerasing --nobest when installing container-tools

One of the tests in the orch suite is running distro install
commands from multiple distros, causing it to first install
container-tools 3.0 and then later install container-tools,
which fails, causing the test to fail. This is sort of a bandaid
fix to getthe test to work. It will cause whatever the last
version of the package to be installed to end up being installed
(and will do so without error) which is what we want in the tests.

Fixes: https://tracker.ceph.com/issues/57771
Signed-off-by: Adam King <adking@redhat.com>

diff --git a/qa/distros/container-hosts/centos_8.stream_container_tools.yaml b/qa/distros/container-hosts/centos_8.stream_container_tools.yaml
index 4a9578e60d4925b2ba209ca26c4ccbc76de625e2..4a76306f19d5994590a9f51458a424948dfbd896 100644 (file)
--- a/qa/distros/container-hosts/centos_8.stream_container_tools.yaml
+++ b/qa/distros/container-hosts/centos_8.stream_container_tools.yaml
@@ -10,5 +10,5 @@ tasks:
     all:
     - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup
     - sudo dnf -y  module reset container-tools
-    - sudo dnf -y  module install container-tools
+    - sudo dnf -y  module install container-tools --allowerasing --nobest
     - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf

diff --git a/qa/distros/container-hosts/centos_8.stream_container_tools_crun.yaml b/qa/distros/container-hosts/centos_8.stream_container_tools_crun.yaml
index e50003ca8af0e24160de3b284afba53b1896ecc5..b06e1c87d7c20c1eed677d41e728e52c7e0da206 100644 (file)
--- a/qa/distros/container-hosts/centos_8.stream_container_tools_crun.yaml
+++ b/qa/distros/container-hosts/centos_8.stream_container_tools_crun.yaml
@@ -10,7 +10,7 @@ tasks:
     all:
     - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup
     - sudo dnf -y  module reset container-tools
-    - sudo dnf -y  module install container-tools
+    - sudo dnf -y  module install container-tools --allowerasing --nobest
     - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf
     - sudo sed -i 's/runtime = "runc"/#runtime = "runc"/g' /usr/share/containers/containers.conf
     - sudo sed -i 's/#runtime = "crun"/runtime = "crun"/g' /usr/share/containers/containers.conf

diff --git a/qa/distros/container-hosts/rhel_8.6_container_tools_3.0.yaml b/qa/distros/container-hosts/rhel_8.6_container_tools_3.0.yaml
index b226053d9e6b4c4b3b8f318ff0c2d78acebbbcc4..361d8546e2b7dca2487088fbd2c7c935f63a2dd9 100644 (file)
--- a/qa/distros/container-hosts/rhel_8.6_container_tools_3.0.yaml
+++ b/qa/distros/container-hosts/rhel_8.6_container_tools_3.0.yaml
@@ -9,5 +9,5 @@ tasks:
     all:
     - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup
     - sudo dnf -y  module reset container-tools
-    - sudo dnf -y  module install container-tools:3.0
+    - sudo dnf -y  module install container-tools:3.0 --allowerasing --nobest
     - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf

diff --git a/qa/distros/container-hosts/rhel_8.6_container_tools_rhel8.yaml b/qa/distros/container-hosts/rhel_8.6_container_tools_rhel8.yaml
index a5c0bbf3e9cb218a8b9f0ef8b93195e0adb2fcf2..be94ed69e7d6f3a008c85fca412cb7b6f35e205f 100644 (file)
--- a/qa/distros/container-hosts/rhel_8.6_container_tools_rhel8.yaml
+++ b/qa/distros/container-hosts/rhel_8.6_container_tools_rhel8.yaml
@@ -9,5 +9,5 @@ tasks:
     all:
     - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup
     - sudo dnf -y  module reset container-tools
-    - sudo dnf -y  module install container-tools:rhel8
+    - sudo dnf -y  module install container-tools:rhel8 --allowerasing --nobest
     - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf

diff --git a/qa/distros/podman/centos_8.stream_container_tools.yaml b/qa/distros/podman/centos_8.stream_container_tools.yaml
index 4a9578e60d4925b2ba209ca26c4ccbc76de625e2..4a76306f19d5994590a9f51458a424948dfbd896 100644 (file)
--- a/qa/distros/podman/centos_8.stream_container_tools.yaml
+++ b/qa/distros/podman/centos_8.stream_container_tools.yaml
@@ -10,5 +10,5 @@ tasks:
     all:
     - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup
     - sudo dnf -y  module reset container-tools
-    - sudo dnf -y  module install container-tools
+    - sudo dnf -y  module install container-tools --allowerasing --nobest
     - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf

diff --git a/qa/distros/podman/rhel_8.6_container_tools_3.0.yaml b/qa/distros/podman/rhel_8.6_container_tools_3.0.yaml
index b226053d9e6b4c4b3b8f318ff0c2d78acebbbcc4..361d8546e2b7dca2487088fbd2c7c935f63a2dd9 100644 (file)
--- a/qa/distros/podman/rhel_8.6_container_tools_3.0.yaml
+++ b/qa/distros/podman/rhel_8.6_container_tools_3.0.yaml
@@ -9,5 +9,5 @@ tasks:
     all:
     - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup
     - sudo dnf -y  module reset container-tools
-    - sudo dnf -y  module install container-tools:3.0
+    - sudo dnf -y  module install container-tools:3.0 --allowerasing --nobest
     - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf

diff --git a/qa/distros/podman/rhel_8.6_container_tools_rhel8.yaml b/qa/distros/podman/rhel_8.6_container_tools_rhel8.yaml
index a5c0bbf3e9cb218a8b9f0ef8b93195e0adb2fcf2..be94ed69e7d6f3a008c85fca412cb7b6f35e205f 100644 (file)
--- a/qa/distros/podman/rhel_8.6_container_tools_rhel8.yaml
+++ b/qa/distros/podman/rhel_8.6_container_tools_rhel8.yaml
@@ -9,5 +9,5 @@ tasks:
     all:
     - sudo cp /etc/containers/registries.conf /etc/containers/registries.conf.backup
     - sudo dnf -y  module reset container-tools
-    - sudo dnf -y  module install container-tools:rhel8
+    - sudo dnf -y  module install container-tools:rhel8 --allowerasing --nobest
     - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf