Add support for testing RHEL10 imagestreams.

Refactoring PyTest so we do not duplicate definitions

Signed-off-by: Petr "Stone" Hracek <[email protected]>

Author: phracek

imagestreams/imagestreams.yaml

@@ -27,6 +27,9 @@
       - name: RHEL 9
         app_versions: [13, 15, 16]
 
+      - name: RHEL 10
+        app_versions: [16]
+
   - filename: postgresql-rhel-aarch64.json
     latest: "16-el9"
     distros:
@@ -35,3 +38,6 @@
 
       - name: RHEL 9
         app_versions: [13, 15, 16]
+
+      - name: RHEL 10
+        app_versions: [16]

imagestreams/postgresql-rhel-aarch64.json

@@ -135,6 +135,24 @@
           "type": "Local"
         }
       },
+      {
+        "name": "16-el10",
+        "annotations": {
+          "openshift.io/display-name": "PostgreSQL 16 (RHEL 10)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Provides a PostgreSQL 16 database on RHEL 10. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.",
+          "iconClass": "icon-postgresql",
+          "tags": "database,postgresql",
+          "version": "16"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "registry.redhat.io/rhel10/postgresql-16:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
       {
         "name": "latest",
         "annotations": {

imagestreams/postgresql-rhel.json

@@ -135,6 +135,24 @@
           "type": "Local"
         }
       },
+      {
+        "name": "16-el10",
+        "annotations": {
+          "openshift.io/display-name": "PostgreSQL 16 (RHEL 10)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Provides a PostgreSQL 16 database on RHEL 10. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.",
+          "iconClass": "icon-postgresql",
+          "tags": "database,postgresql",
+          "version": "16"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "registry.redhat.io/rhel10/postgresql-16:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
       {
         "name": "latest",
         "annotations": {

test/__init__.py

@@ -0,0 +1,5 @@
+TAGS = {
+    "rhel8": "-el8",
+    "rhel9": "-el9",
+    "rhel10": "-el10",
+}

test/constants.py

@@ -29,6 +29,10 @@ get_image_id ()
                 ns=rhel9
                 local image=registry.redhat.io/$ns/postgresql-${version}
                 ;;
+            rhel10)
+                ns=rhel10
+                local image=registry.redhat.io/$ns/postgresql-${version}
+                ;;
             c9s)
                 ns=c9s
                 local image=quay.io/sclorg/postgresql-${version}-$ns

test/pg-test-lib.sh

@@ -44,6 +44,8 @@ function test_postgresql_imagestream() {
   tag="-el8"
   if [ "${OS}" == "rhel9" ]; then
     tag="-el9"
+  elif [ "${OS}" == "rhel10" ]; then
+    tag="-el10"
   fi
   # Check if the current version is already GA
   # This directory is cloned from TMT plan repo 'sclorg-tmt-plans'

test/test-lib-postgresql.sh

@@ -6,6 +6,8 @@
 from container_ci_suite.openshift import OpenShiftAPI
 from container_ci_suite.utils import check_variables
 
+from constants import TAGS
+
 if not check_variables():
     print("At least one variable from IMAGE_NAME, OS, VERSION is missing.")
     sys.exit(1)
@@ -14,17 +16,14 @@
 VERSION = os.getenv("VERSION")
 IMAGE_NAME = os.getenv("IMAGE_NAME")
 OS = os.getenv("TARGET")
-TAGS = {
-    "rhel8": "-el8",
-    "rhel9": "-el9"
-}
-TAG = TAGS.get(OS, None)
+
+TAG = TAGS.get(OS)
 
 
 class TestPostgreSQLImagestreamTemplate:
 
     def setup_method(self):
-        self.oc_api = OpenShiftAPI(pod_name_prefix="postgresql", version=VERSION)
+        self.oc_api = OpenShiftAPI(pod_name_prefix="postgresql", version=VERSION, shared_cluster=True)
 
     def teardown_method(self):
         self.oc_api.delete_project()

test/test_postgresql_imagestream.py

@@ -6,6 +6,8 @@
 from container_ci_suite.openshift import OpenShiftAPI
 from container_ci_suite.utils import check_variables
 
+from constants import TAGS
+
 if not check_variables():
     print("At least one variable from IMAGE_NAME, OS, VERSION is missing.")
     sys.exit(1)
@@ -14,17 +16,14 @@
 VERSION = os.getenv("VERSION")
 IMAGE_NAME = os.getenv("IMAGE_NAME")
 OS = os.getenv("TARGET")
-TAGS = {
-    "rhel8": "-el8",
-    "rhel9": "-el9"
-}
-TAG = TAGS.get(OS, None)
+
+TAG = TAGS.get(OS)
 
 
 class TestPostgreSQLImagestreamTemplate:
 
     def setup_method(self):
-        self.oc_api = OpenShiftAPI(pod_name_prefix="postgresql", version=VERSION)
+        self.oc_api = OpenShiftAPI(pod_name_prefix="postgresql", version=VERSION, shared_cluster=True)
 
     def teardown_method(self):
         self.oc_api.delete_project()

test/test_postgresql_imagestream_template.py

@@ -6,6 +6,8 @@
 from container_ci_suite.openshift import OpenShiftAPI
 from container_ci_suite.utils import check_variables
 
+from constants import TAGS
+
 if not check_variables():
     print("At least one variable from IMAGE_NAME, OS, VERSION is missing.")
     sys.exit(1)
@@ -15,17 +17,13 @@
 IMAGE_NAME = os.getenv("IMAGE_NAME")
 OS = os.getenv("TARGET")
 
-TAGS = {
-    "rhel8": "-el8",
-    "rhel9": "-el9"
-}
-TAG = TAGS.get(OS, None)
+TAG = TAGS.get(OS)
 
 
 class TestPostgreSQLDeployTemplate:
 
     def setup_method(self):
-        self.oc_api = OpenShiftAPI(pod_name_prefix="postgresql-testing", version=VERSION)
+        self.oc_api = OpenShiftAPI(pod_name_prefix="postgresql-testing", version=VERSION, shared_cluster=True)
 
     def teardown_method(self):
         self.oc_api.delete_project()