Allow testing RHEL10 imagestreams

2.4-micro/test/__init__.py

@@ -0,0 +1 @@
+../../test/__init__.py

2.4-micro/test/constants.py

@@ -0,0 +1 @@
+../../test/constants.py

2.4/test/__init__.py

@@ -0,0 +1 @@
+../../test/__init__.py

2.4/test/constants.py

@@ -0,0 +1 @@
+../../test/constants.py

imagestreams/httpd-centos.json

@@ -47,6 +47,25 @@
           "type": "Local"
         }
       },
+      {
+        "name": "2.4-ubi10",
+        "annotations": {
+          "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 10)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.",
+          "iconClass": "icon-httpd",
+          "tags": "builder,httpd",
+          "version": "2.4",
+          "sampleRepo": "https://github.com/sclorg/httpd-ex.git"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "registry.access.redhat.com/ubi10/httpd-24:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
       {
         "name": "2.4-micro-el9",
         "annotations": {

imagestreams/httpd-rhel-aarch64.json

@@ -47,6 +47,25 @@
           "type": "Local"
         }
       },
+      {
+        "name": "2.4-ubi10",
+        "annotations": {
+          "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 10)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.",
+          "iconClass": "icon-httpd",
+          "tags": "builder,httpd",
+          "version": "2.4",
+          "sampleRepo": "https://github.com/sclorg/httpd-ex.git"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "registry.redhat.io/ubi10/httpd-24:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
       {
         "name": "2.4-el8",
         "annotations": {

imagestreams/httpd-rhel.json

@@ -47,6 +47,25 @@
           "type": "Local"
         }
       },
+      {
+        "name": "2.4-ubi10",
+        "annotations": {
+          "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 10)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.",
+          "iconClass": "icon-httpd",
+          "tags": "builder,httpd",
+          "version": "2.4",
+          "sampleRepo": "https://github.com/sclorg/httpd-ex.git"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "registry.redhat.io/ubi10/httpd-24:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
       {
         "name": "2.4-el8",
         "annotations": {
@@ -71,15 +90,15 @@
         "annotations": {
           "openshift.io/display-name": "Apache HTTP Server 2.4 (Latest)",
           "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n",
+          "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n",
           "iconClass": "icon-httpd",
           "tags": "builder,httpd",
           "version": "2.4",
           "sampleRepo": "https://github.com/sclorg/httpd-ex.git"
         },
         "from": {
           "kind": "ImageStreamTag",
-          "name": "2.4-ubi8"
+          "name": "2.4-ubi9"
         },
         "referencePolicy": {
           "type": "Local"

imagestreams/imagestreams.yaml

@@ -18,18 +18,24 @@
       - name: UBI 9
         app_versions: ["2.4"]
 
+      - name: UBI 10
+        app_versions: ["2.4"]
+
       - name: CentOS Stream 9
         app_versions: ["2.4-micro"]
 
   - filename: httpd-rhel.json
-    latest: "2.4-ubi8"
+    latest: "2.4-ubi9"
     distros:
       - name: UBI 8
         app_versions: ["2.4"]
 
       - name: UBI 9
         app_versions: ["2.4"]
 
+      - name: UBI 10
+        app_versions: ["2.4"]
+
       - name: RHEL 8
         app_versions: ["2.4"]
 
@@ -43,5 +49,8 @@
       - name: UBI 9
         app_versions: ["2.4"]
 
+      - name: UBI 10
+        app_versions: ["2.4"]
+
       - name: RHEL 8
         app_versions: ["2.4"]

test/constants.py

@@ -0,0 +1,5 @@
+TAGS = {
+    "rhel8": "-ubi8",
+    "rhel9": "-ubi9",
+    "rhel10": "-ubi10",
+}

test/test_httpd_ex_template.py

@@ -16,7 +16,6 @@
 
 VERSION = os.getenv("VERSION")
 IMAGE_NAME = os.getenv("IMAGE_NAME")
-BRANCH_TO_TEST = "master"
 
 
 class TestHTTPDExExampleRepo:
@@ -31,7 +30,7 @@ def teardown_method(self):
     def test_httpd_ex_template_inside_cluster(self):
         assert self.oc_api.deploy_s2i_app(
             image_name=IMAGE_NAME,
-            app=f"https://github.com/sclorg/httpd-ex#{BRANCH_TO_TEST}",
+            app=f"https://github.com/sclorg/httpd-ex#master",
             context="."
         )
         assert self.oc_api.is_template_deployed(name_in_template=self.template_name)

test/test_httpd_imagestream_s2i.py

@@ -6,11 +6,11 @@
 from container_ci_suite.openshift import OpenShiftAPI
 from container_ci_suite.utils import get_service_image, check_variables
 
+
 if not check_variables():
     print("At least one variable from IMAGE_NAME, OS, SINGLE_VERSION is missing.")
     sys.exit(1)
 
-BRANCH_TO_TEST = "master"
 IMAGE_NAME = os.getenv("IMAGE_NAME")
 OS = os.getenv("OS")
 VERSION = os.getenv("VERSION")

test/test_httpd_integration.py

@@ -6,14 +6,12 @@
 from container_ci_suite.openshift import OpenShiftAPI
 from container_ci_suite.utils import get_service_image, check_variables
 
-
 if not check_variables():
     print("At least one variable from IMAGE_NAME, OS, VERSION is missing.")
     sys.exit(1)
 
 VERSION = os.getenv("VERSION")
 IMAGE_NAME = os.getenv("IMAGE_NAME")
-BRANCH_TO_TEST = "master"
 
 
 class TestHTTPDIntegrationTemplate:

test/test_httpd_shared_helm_template.py

@@ -5,19 +5,15 @@
 
 from container_ci_suite.helm import HelmChartsAPI
 
+from constants import TAGS
+
+
 test_dir = Path(os.path.abspath(os.path.dirname(__file__)))
 
 VERSION = os.getenv("VERSION")
 IMAGE_NAME = os.getenv("IMAGE_NAME")
-BRANCH_TO_TEST = "master"
 OS = os.getenv("OS")
 
-TAGS = {
-    "rhel8": "-el8",
-    "rhel9": "-el9",
-    "rhel10": "-el10"
-}
-
 TAG = TAGS.get(OS)