test: Update RHEL UBI images to UBI 8.10 and UBI 9.4 (#753)

nginxinc · Jul 28, 2024 · eed6af8 · eed6af8
1 parent 3a6d970
commit eed6af8
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,10 @@ DOCUMENTATION:
 - Update community docs per the latest [NGINX template repository](https://github.com/nginxinc/template-repository) guidelines.
 - Update and tweak the README. In order to make the installation instructions easier, some file names used by the various GitHub Actions workflows have been renamed.
 
+TESTS:
+
+- Update RHEL UBI images to UBI 8.10 and UBI 9.4.
+
 CI/CD:
 
 - Update GitHub Actions to Ubuntu 24.04.

diff --git a/molecule/agent/molecule.yml b/molecule/agent/molecule.yml
@@ -100,15 +100,15 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-8
-    image: redhat/ubi8:8.9
+    image: redhat/ubi8:8.10
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.3
+    image: redhat/ubi9:9.4
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host

diff --git a/molecule/amplify/molecule.yml b/molecule/amplify/molecule.yml
@@ -28,7 +28,7 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.3
+    image: redhat/ubi9:9.4
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -100,15 +100,15 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-8
-    image: redhat/ubi8:8.9
+    image: redhat/ubi8:8.10
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.3
+    image: redhat/ubi9:9.4
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host

diff --git a/molecule/distribution/molecule.yml b/molecule/distribution/molecule.yml
@@ -100,15 +100,15 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-8
-    image: redhat/ubi8:8.9
+    image: redhat/ubi8:8.10
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.3
+    image: redhat/ubi9:9.4
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host

diff --git a/molecule/downgrade-plus/molecule.yml b/molecule/downgrade-plus/molecule.yml
@@ -101,15 +101,15 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-8
-    image: redhat/ubi8:8.9
+    image: redhat/ubi8:8.10
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.3
+    image: redhat/ubi9:9.4
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host

diff --git a/molecule/downgrade/molecule.yml b/molecule/downgrade/molecule.yml
@@ -100,15 +100,15 @@ platforms: # Alpine 3.20 only has one version of NGINX OSS available (at the mom
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-8
-    image: redhat/ubi8:8.9
+    image: redhat/ubi8:8.10
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.3
+    image: redhat/ubi9:9.4
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host

diff --git a/molecule/plus/molecule.yml b/molecule/plus/molecule.yml
@@ -101,15 +101,15 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-8
-    image: redhat/ubi8:8.9
+    image: redhat/ubi8:8.10
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.3
+    image: redhat/ubi9:9.4
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host

diff --git a/molecule/source-version/molecule.yml b/molecule/source-version/molecule.yml
@@ -100,15 +100,15 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-8
-    image: redhat/ubi8:8.9
+    image: redhat/ubi8:8.10
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.3
+    image: redhat/ubi9:9.4
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host

diff --git a/molecule/source/molecule.yml b/molecule/source/molecule.yml
@@ -100,15 +100,15 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-8
-    image: redhat/ubi8:8.9
+    image: redhat/ubi8:8.10
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.3
+    image: redhat/ubi9:9.4
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host

diff --git a/molecule/stable/molecule.yml b/molecule/stable/molecule.yml
@@ -100,15 +100,15 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-8
-    image: redhat/ubi8:8.9
+    image: redhat/ubi8:8.10
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.3
+    image: redhat/ubi9:9.4
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host

diff --git a/molecule/uninstall-plus/molecule.yml b/molecule/uninstall-plus/molecule.yml
@@ -101,15 +101,15 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-8
-    image: redhat/ubi8:8.9
+    image: redhat/ubi8:8.10
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.3
+    image: redhat/ubi9:9.4
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host

diff --git a/molecule/uninstall/molecule.yml b/molecule/uninstall/molecule.yml
@@ -100,15 +100,15 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-8
-    image: redhat/ubi8:8.9
+    image: redhat/ubi8:8.10
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.3
+    image: redhat/ubi9:9.4
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host

diff --git a/molecule/upgrade-plus/molecule.yml b/molecule/upgrade-plus/molecule.yml
@@ -101,15 +101,15 @@ platforms: # Ubuntu noble only has one version of NGINX Plus available (at the m
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-8
-    image: redhat/ubi8:8.9
+    image: redhat/ubi8:8.10
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.3
+    image: redhat/ubi9:9.4
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host

diff --git a/molecule/upgrade/molecule.yml b/molecule/upgrade/molecule.yml
@@ -100,15 +100,15 @@ platforms: # Alpine 3.20 only has one version of NGINX OSS available (at the mom
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-8
-    image: redhat/ubi8:8.9
+    image: redhat/ubi8:8.10
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.3
+    image: redhat/ubi9:9.4
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host

diff --git a/molecule/version/molecule.yml b/molecule/version/molecule.yml
@@ -100,15 +100,15 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-8
-    image: redhat/ubi8:8.9
+    image: redhat/ubi8:8.10
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw
     command: /usr/sbin/init
   - name: rhel-9
-    image: redhat/ubi9:9.3
+    image: redhat/ubi9:9.4
     dockerfile: ../common/Dockerfile.j2
     privileged: true
     cgroupns_mode: host