Adding upstream version 18.2.4.upstream/18.2.4upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

38 files changed, 57 insertions, 78 deletions

diff --git a/qa/distros/a-supported-distro.yaml b/qa/distros/a-supported-distro.yaml
deleted file mode 120000
index 33a40b6e4..000000000
--- a/qa/distros/a-supported-distro.yaml
+++ /dev/null
@@ -1 +0,0 @@
-all/centos_7.2.yaml
\ No newline at end of file
diff --git a/qa/distros/all/centos_7.6.yaml b/qa/distros/all/centos_7.6.yaml
index 81014e102..1eddf680c 100644
--- a/qa/distros/all/centos_7.6.yaml
+++ b/qa/distros/all/centos_7.6.yaml
@@ -2,6 +2,6 @@ os_type: centos
 os_version: "7.6"
 overrides:
   selinux:
-    whitelist:
+    allowlist:
       - scontext=system_u:system_r:logrotate_t:s0
 ktype: distro
diff --git a/qa/distros/all/centos_8.0.yaml b/qa/distros/all/centos_8.0.yaml
index 1679bf0d5..787bbfeb0 100644
--- a/qa/distros/all/centos_8.0.yaml
+++ b/qa/distros/all/centos_8.0.yaml
@@ -2,6 +2,6 @@ os_type: centos
 os_version: "8.0"
 overrides:
   selinux:
-    whitelist:
+    allowlist:
       - scontext=system_u:system_r:logrotate_t:s0
 ktype: distro
diff --git a/qa/distros/all/centos_8.1.yaml b/qa/distros/all/centos_8.1.yaml
index f764e5079..986e74abf 100644
--- a/qa/distros/all/centos_8.1.yaml
+++ b/qa/distros/all/centos_8.1.yaml
@@ -2,6 +2,6 @@ os_type: centos
 os_version: "8.1"
 overrides:
   selinux:
-    whitelist:
+    allowlist:
       - scontext=system_u:system_r:logrotate_t:s0
 ktype: distro
diff --git a/qa/distros/all/centos_8.2.yaml b/qa/distros/all/centos_8.2.yaml
index 1ccbd8abd..d9f6178c6 100644
--- a/qa/distros/all/centos_8.2.yaml
+++ b/qa/distros/all/centos_8.2.yaml
@@ -2,6 +2,6 @@ os_type: centos
 os_version: "8.2"
 overrides:
   selinux:
-    whitelist:
+    allowlist:
       - scontext=system_u:system_r:logrotate_t:s0
 ktype: distro
diff --git a/qa/distros/all/centos_8.3.yaml b/qa/distros/all/centos_8.3.yaml
index b9a7c2579..54e1c3b11 100644
--- a/qa/distros/all/centos_8.3.yaml
+++ b/qa/distros/all/centos_8.3.yaml
@@ -2,6 +2,6 @@ os_type: centos
 os_version: "8.3"
 overrides:
   selinux:
-    whitelist:
+    allowlist:
       - scontext=system_u:system_r:logrotate_t:s0
 ktype: distro
diff --git a/qa/distros/all/centos_8.stream.yaml b/qa/distros/all/centos_8.stream.yaml
index 5ae75c6be..f9607d2c6 100644
--- a/qa/distros/all/centos_8.stream.yaml
+++ b/qa/distros/all/centos_8.stream.yaml
@@ -2,6 +2,6 @@ os_type: centos
 os_version: "8.stream"
 overrides:
   selinux:
-    whitelist:
+    allowlist:
       - scontext=system_u:system_r:logrotate_t:s0
 ktype: distro
diff --git a/qa/distros/all/centos_9.stream.yaml b/qa/distros/all/centos_9.stream.yaml
index 52d553bd6..7fe93afcf 100644
--- a/qa/distros/all/centos_9.stream.yaml
+++ b/qa/distros/all/centos_9.stream.yaml
@@ -1,2 +1,6 @@
 os_type: centos
 os_version: "9.stream"
+overrides:
+  selinux:
+    allowlist:
+      - scontext=system_u:system_r:getty_t:s0
diff --git a/qa/distros/all/rhel_7.6.yaml b/qa/distros/all/rhel_7.6.yaml
index 37bc0fb4a..5a0753014 100644
--- a/qa/distros/all/rhel_7.6.yaml
+++ b/qa/distros/all/rhel_7.6.yaml
@@ -2,6 +2,6 @@ os_type: rhel
 os_version: "7.6"
 overrides:
   selinux:
-    whitelist:
+    allowlist:
       - scontext=system_u:system_r:logrotate_t:s0
 ktype: distro
diff --git a/qa/distros/all/rhel_7.7.yaml b/qa/distros/all/rhel_7.7.yaml
index ac44fe18e..654c73177 100644
--- a/qa/distros/all/rhel_7.7.yaml
+++ b/qa/distros/all/rhel_7.7.yaml
@@ -2,6 +2,6 @@ os_type: rhel
 os_version: "7.7"
 overrides:
   selinux:
-    whitelist:
+    allowlist:
       - scontext=system_u:system_r:logrotate_t:s0
 ktype: distro
diff --git a/qa/distros/all/rhel_8.0.yaml b/qa/distros/all/rhel_8.0.yaml
index da6a33ed0..760573990 100644
--- a/qa/distros/all/rhel_8.0.yaml
+++ b/qa/distros/all/rhel_8.0.yaml
@@ -2,6 +2,6 @@ os_type: rhel
 os_version: "8.0"
 overrides:
   selinux:
-    whitelist:
+    allowlist:
       - scontext=system_u:system_r:logrotate_t:s0
 ktype: distro
diff --git a/qa/distros/all/rhel_8.1.yaml b/qa/distros/all/rhel_8.1.yaml
index c73893149..4b0439c0f 100644
--- a/qa/distros/all/rhel_8.1.yaml
+++ b/qa/distros/all/rhel_8.1.yaml
@@ -2,6 +2,6 @@ os_type: rhel
 os_version: "8.1"
 overrides:
   selinux:
-    whitelist:
+    allowlist:
       - scontext=system_u:system_r:logrotate_t:s0
 ktype: distro
diff --git a/qa/distros/all/rhel_8.3.yaml b/qa/distros/all/rhel_8.3.yaml
index 4e44bbff5..48414fe75 100644
--- a/qa/distros/all/rhel_8.3.yaml
+++ b/qa/distros/all/rhel_8.3.yaml
@@ -2,6 +2,6 @@ os_type: rhel
 os_version: "8.3"
 overrides:
   selinux:
-    whitelist:
+    allowlist:
       - scontext=system_u:system_r:logrotate_t:s0
 ktype: distro
diff --git a/qa/distros/all/rhel_8.4.yaml b/qa/distros/all/rhel_8.4.yaml
index 5a299ffc5..2d4088392 100644
--- a/qa/distros/all/rhel_8.4.yaml
+++ b/qa/distros/all/rhel_8.4.yaml
@@ -2,6 +2,6 @@ os_type: rhel
 os_version: "8.4"
 overrides:
   selinux:
-    whitelist:
+    allowlist:
       - scontext=system_u:system_r:logrotate_t:s0
 ktype: distro
diff --git a/qa/distros/all/rhel_8.5.yaml b/qa/distros/all/rhel_8.5.yaml
index 3e02bb196..591b22661 100644
--- a/qa/distros/all/rhel_8.5.yaml
+++ b/qa/distros/all/rhel_8.5.yaml
@@ -2,6 +2,6 @@ os_type: rhel
 os_version: "8.5"
 overrides:
   selinux:
-    whitelist:
+    allowlist:
       - scontext=system_u:system_r:logrotate_t:s0
 ktype: distro
diff --git a/qa/distros/all/rhel_8.6.yaml b/qa/distros/all/rhel_8.6.yaml
index 1f9a6b73f..f70647ed8 100644
--- a/qa/distros/all/rhel_8.6.yaml
+++ b/qa/distros/all/rhel_8.6.yaml
@@ -2,6 +2,6 @@ os_type: rhel
 os_version: "8.6"
 overrides:
   selinux:
-    whitelist:
+    allowlist:
       - scontext=system_u:system_r:logrotate_t:s0
 ktype: distro
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
diff --git a/qa/distros/crimson-supported-all-distro/centos_8.yaml b/qa/distros/crimson-supported-all-distro/centos_8.yaml
deleted file mode 120000
index b7e6c9b4e..000000000
--- a/qa/distros/crimson-supported-all-distro/centos_8.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../all/centos_8.yaml
\ No newline at end of file
diff --git a/qa/distros/podman/centos_8.stream_container_tools.yaml b/qa/distros/podman/centos_8.stream_container_tools.yaml
index 4a76306f1..3dad3b845 100644
--- a/qa/distros/podman/centos_8.stream_container_tools.yaml
+++ b/qa/distros/podman/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/podman/centos_9.stream.yaml b/qa/distros/podman/centos_9.stream.yaml
new file mode 100644
index 000000000..d3bc430e6
--- /dev/null
+++ b/qa/distros/podman/centos_9.stream.yaml
@@ -0,0 +1,7 @@
+os_type: centos
+os_version: "9.stream"
+overrides:
+  selinux:
+    whitelist:
+      - scontext=system_u:system_r:logrotate_t:s0
+
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
deleted file mode 100644
index 361d8546e..000000000
--- a/qa/distros/podman/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/podman/rhel_8.6_container_tools_rhel8.yaml b/qa/distros/podman/rhel_8.6_container_tools_rhel8.yaml
deleted file mode 100644
index be94ed69e..000000000
--- a/qa/distros/podman/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/single-container-host.yaml b/qa/distros/single-container-host.yaml
index f71756d42..08e1be9c2 120000
--- a/qa/distros/single-container-host.yaml
+++ b/qa/distros/single-container-host.yaml
@@ -1 +1 @@
-container-hosts/centos_8.stream_container_tools_crun.yaml
\ No newline at end of file
+container-hosts/centos_9.stream.yaml
\ No newline at end of file
diff --git a/qa/distros/supported-all-distro/centos_8.yaml b/qa/distros/supported-all-distro/centos_8.yaml
deleted file mode 120000
index b7e6c9b4e..000000000
--- a/qa/distros/supported-all-distro/centos_8.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../all/centos_8.yaml
\ No newline at end of file
diff --git a/qa/distros/supported-all-distro/rhel_8.yaml b/qa/distros/supported-all-distro/rhel_8.yaml
deleted file mode 120000
index f803f091e..000000000
--- a/qa/distros/supported-all-distro/rhel_8.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../all/rhel_8.yaml
\ No newline at end of file
diff --git a/qa/distros/supported-container-hosts/centos_9.stream.yaml b/qa/distros/supported-container-hosts/centos_9.stream.yaml
new file mode 120000
index 000000000..584cad677
--- /dev/null
+++ b/qa/distros/supported-container-hosts/centos_9.stream.yaml
@@ -0,0 +1 @@
+../container-hosts/centos_9.stream.yaml
\ No newline at end of file
diff --git a/qa/distros/supported-container-hosts/centos_9.stream_runc.yaml b/qa/distros/supported-container-hosts/centos_9.stream_runc.yaml
new file mode 120000
index 000000000..81b17ea14
--- /dev/null
+++ b/qa/distros/supported-container-hosts/centos_9.stream_runc.yaml
@@ -0,0 +1 @@
+../container-hosts/centos_9.stream_runc.yaml
\ No newline at end of file
diff --git a/qa/distros/supported-container-hosts/ubuntu_22.04.yaml b/qa/distros/supported-container-hosts/ubuntu_22.04.yaml
new file mode 120000
index 000000000..01afa8a63
--- /dev/null
+++ b/qa/distros/supported-container-hosts/ubuntu_22.04.yaml
@@ -0,0 +1 @@
+../container-hosts/ubuntu_22.04.yaml
\ No newline at end of file
diff --git a/qa/distros/supported-random-distro$/centos_8.yaml b/qa/distros/supported-random-distro$/centos_8.yaml
deleted file mode 120000
index b7e6c9b4e..000000000
--- a/qa/distros/supported-random-distro$/centos_8.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../all/centos_8.yaml
\ No newline at end of file
diff --git a/qa/distros/supported-random-distro$/rhel_8.yaml b/qa/distros/supported-random-distro$/rhel_8.yaml
deleted file mode 120000
index f803f091e..000000000
--- a/qa/distros/supported-random-distro$/rhel_8.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../all/rhel_8.yaml
\ No newline at end of file
diff --git a/qa/distros/supported/centos_8.stream.yaml b/qa/distros/supported/centos_8.stream.yaml
deleted file mode 120000
index e96091bb1..000000000
--- a/qa/distros/supported/centos_8.stream.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../all/centos_8.stream.yaml
\ No newline at end of file
diff --git a/qa/distros/supported/rhel_latest.yaml b/qa/distros/supported/rhel_latest.yaml
deleted file mode 120000
index f803f091e..000000000
--- a/qa/distros/supported/rhel_latest.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../all/rhel_8.yaml
\ No newline at end of file