summaryrefslogtreecommitdiffstats
path: root/qa/distros/container-hosts
diff options
context:
space:
mode:
Diffstat (limited to 'qa/distros/container-hosts')
-rw-r--r--qa/distros/container-hosts/centos_8.stream_container_tools.yaml2
-rw-r--r--qa/distros/container-hosts/centos_8.stream_container_tools_crun.yaml2
-rw-r--r--qa/distros/container-hosts/centos_9.stream.yaml11
-rw-r--r--qa/distros/container-hosts/centos_9.stream_runc.yaml13
-rw-r--r--qa/distros/container-hosts/rhel_8.6_container_tools_3.0.yaml13
-rw-r--r--qa/distros/container-hosts/rhel_8.6_container_tools_rhel8.yaml13
l---------qa/distros/container-hosts/ubuntu_22.04.yaml1
7 files changed, 27 insertions, 28 deletions
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 4a76306f1..3dad3b845 100644
--- a/qa/distros/container-hosts/centos_8.stream_container_tools.yaml
+++ b/qa/distros/container-hosts/centos_8.stream_container_tools.yaml
@@ -2,7 +2,7 @@ os_type: centos
os_version: "8.stream"
overrides:
selinux:
- whitelist:
+ allowlist:
- scontext=system_u:system_r:logrotate_t:s0
tasks:
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 b06e1c87d..d1d395b93 100644
--- a/qa/distros/container-hosts/centos_8.stream_container_tools_crun.yaml
+++ b/qa/distros/container-hosts/centos_8.stream_container_tools_crun.yaml
@@ -2,7 +2,7 @@ os_type: centos
os_version: "8.stream"
overrides:
selinux:
- whitelist:
+ allowlist:
- scontext=system_u:system_r:logrotate_t:s0
tasks:
diff --git a/qa/distros/container-hosts/centos_9.stream.yaml b/qa/distros/container-hosts/centos_9.stream.yaml
new file mode 100644
index 000000000..45295bb4a
--- /dev/null
+++ b/qa/distros/container-hosts/centos_9.stream.yaml
@@ -0,0 +1,11 @@
+os_type: centos
+os_version: "9.stream"
+overrides:
+ selinux:
+ whitelist:
+ - scontext=system_u:system_r:logrotate_t:s0
+
+tasks:
+- pexec:
+ all:
+ - sudo dnf install nvmetcli nvme-cli -y
diff --git a/qa/distros/container-hosts/centos_9.stream_runc.yaml b/qa/distros/container-hosts/centos_9.stream_runc.yaml
new file mode 100644
index 000000000..ed9cb9cc8
--- /dev/null
+++ b/qa/distros/container-hosts/centos_9.stream_runc.yaml
@@ -0,0 +1,13 @@
+os_type: centos
+os_version: "9.stream"
+overrides:
+ selinux:
+ whitelist:
+ - scontext=system_u:system_r:logrotate_t:s0
+
+tasks:
+- pexec:
+ all:
+ - sudo dnf install runc nvmetcli nvme-cli -y
+ - sudo sed -i 's/^#runtime = "crun"/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
deleted file mode 100644
index 361d8546e..000000000
--- a/qa/distros/container-hosts/rhel_8.6_container_tools_3.0.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-os_type: rhel
-os_version: "8.6"
-overrides:
- selinux:
- whitelist:
- - scontext=system_u:system_r:logrotate_t:s0
-tasks:
-- pexec:
- 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 --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
deleted file mode 100644
index be94ed69e..000000000
--- a/qa/distros/container-hosts/rhel_8.6_container_tools_rhel8.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-os_type: rhel
-os_version: "8.6"
-overrides:
- selinux:
- whitelist:
- - scontext=system_u:system_r:logrotate_t:s0
-tasks:
-- pexec:
- 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 --allowerasing --nobest
- - sudo cp /etc/containers/registries.conf.backup /etc/containers/registries.conf
diff --git a/qa/distros/container-hosts/ubuntu_22.04.yaml b/qa/distros/container-hosts/ubuntu_22.04.yaml
new file mode 120000
index 000000000..0a708b4db
--- /dev/null
+++ b/qa/distros/container-hosts/ubuntu_22.04.yaml
@@ -0,0 +1 @@
+.qa/distros/all/ubuntu_22.04.yaml \ No newline at end of file