Imagestreams generator (#205)

* add YAML conf for imagestream generator * add files generated by imagtreams generator * add github action for checking imagestreams
sclorg · Apr 8, 2024 · 0e826d7 · 0e826d7
1 parent 8fddad7
commit 0e826d7
Show file tree

Hide file tree

Showing 6 changed files with 184 additions and 233 deletions.
diff --git a/.github/workflows/openshift-tests.yml b/.github/workflows/openshift-tests.yml
@@ -3,10 +3,24 @@ on:
     types:
       - created
 jobs:
+  check-imagestreams:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      statuses: write
+    if: |
+      github.event.issue.pull_request
+      && (contains(github.event.comment.body, '[test-openshift]') || contains(github.event.comment.body, '[test-all]'))
+      && contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association)
+    steps:
+      - uses: sclorg/ci-scripts/ocp-stream-generator@master
+        with:
+          ref: "refs/pull/${{ github.event.issue.number }}/head"
+
   openshift-tests:
-    # This job only runs for '[test-all]' or '[test-openshift] pull request comments by owner, member
     name: "${{ matrix.test_case }} tests: ${{ matrix.version }} - ${{ matrix.os_test }}"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
+    needs: check-imagestreams
     concurrency:
       group: ocp-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }}
       cancel-in-progress: true
@@ -17,10 +31,6 @@ jobs:
         os_test: [ "rhel7", "rhel8", "rhel9"]
         test_case: [ "openshift-4" ]
 
-    if: |
-      github.event.issue.pull_request
-      && (contains(github.event.comment.body, '[test-openshift]') || contains(github.event.comment.body, '[test-all]'))
-      && contains(fromJson('["OWNER", "MEMBER"]'), github.event.comment.author_association)
     steps:
       - uses: sclorg/tfaga-wrapper@main
         with:

diff --git a/imagestreams/.imagestreams.yaml.swp b/imagestreams/.imagestreams.yaml.swp
diff --git a/imagestreams/httpd-centos.json b/imagestreams/httpd-centos.json
@@ -4,65 +4,25 @@
   "metadata": {
     "name": "httpd",
     "annotations": {
-      "openshift.io/display-name": "Apache HTTP Server (httpd)"
+      "openshift.io/display-name": "Apache HTTP Server"
     }
   },
   "spec": {
     "tags": [
       {
-        "name": "latest",
-        "annotations": {
-          "description": "Build and serve static content via Apache HTTP Server (httpd) 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 of Httpd available on OpenShift, including major version updates.",
-          "iconClass": "icon-apache",
-          "openshift.io/display-name": "Apache HTTP Server (Latest)",
-          "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "sampleRepo": "https://github.com/sclorg/httpd-ex.git",
-          "supports": "httpd",
-          "tags": "builder,httpd"
-        },
-        "from": {
-          "kind": "ImageStreamTag",
-          "name": "2.4-ubi9"
-        },
-        "referencePolicy": {
-          "type": "Local"
-        }
-      },
-      {
-        "name": "2.4-fc",
-        "annotations": {
-          "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on Fedora. 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-apache",
-          "openshift.io/display-name": "Apache HTTP Server 2.4 (Fedora)",
-          "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "sampleRepo": "https://github.com/sclorg/httpd-ex.git",
-          "supports": "httpd",
-          "tags": "builder,httpd",
-          "version": "2.4"
-        },
-        "from": {
-          "kind": "DockerImage",
-          "name": "quay.io/fedora/httpd-24:latest"
-        },
-        "referencePolicy": {
-          "type": "Local"
-        }
-      },
-      {
-        "name": "2.4-micro-fc",
+        "name": "2.4-ubi8",
         "annotations": {
-          "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on Fedora. 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-apache",
-          "openshift.io/display-name": "Apache HTTP Server 2.4 Micro (Fedora)",
+          "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 8)",
           "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "sampleRepo": "https://github.com/sclorg/httpd-ex.git",
-          "supports": "httpd",
+          "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.",
+          "iconClass": "icon-httpd",
           "tags": "builder,httpd",
-          "version": "2.4"
+          "version": "2.4",
+          "sampleRepo": "https://github.com/sclorg/httpd-ex.git"
         },
         "from": {
           "kind": "DockerImage",
-          "name": "quay.io/fedora/httpd-24-micro:latest"
+          "name": "registry.access.redhat.com/ubi8/httpd-24:latest"
         },
         "referencePolicy": {
           "type": "Local"
@@ -71,14 +31,13 @@
       {
         "name": "2.4-ubi9",
         "annotations": {
-          "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.",
-          "iconClass": "icon-apache",
           "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 9)",
           "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "sampleRepo": "https://github.com/sclorg/httpd-ex.git",
-          "supports": "httpd",
+          "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.",
+          "iconClass": "icon-httpd",
           "tags": "builder,httpd",
-          "version": "2.4"
+          "version": "2.4",
+          "sampleRepo": "https://github.com/sclorg/httpd-ex.git"
         },
         "from": {
           "kind": "DockerImage",
@@ -88,57 +47,16 @@
           "type": "Local"
         }
       },
-      {
-        "name": "2.4-micro-el9",
-        "annotations": {
-          "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on CentOS 9 Stream. 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-apache",
-          "openshift.io/display-name": "Apache HTTP Server 2.4 Micro (CentOS 9 Stream)",
-          "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "sampleRepo": "https://github.com/sclorg/httpd-ex.git",
-          "supports": "httpd",
-          "tags": "builder,httpd",
-          "version": "2.4"
-        },
-        "from": {
-          "kind": "DockerImage",
-          "name": "quay.io/sclorg/httpd-24-micro-c9s:latest"
-        },
-        "referencePolicy": {
-          "type": "Local"
-        }
-      },
-      {
-        "name": "2.4-ubi8",
-        "annotations": {
-          "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.",
-          "iconClass": "icon-apache",
-          "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 8)",
-          "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "sampleRepo": "https://github.com/sclorg/httpd-ex.git",
-          "supports": "httpd",
-          "tags": "builder,httpd",
-          "version": "2.4"
-        },
-        "from": {
-          "kind": "DockerImage",
-          "name": "registry.access.redhat.com/ubi8/httpd-24:latest"
-        },
-        "referencePolicy": {
-          "type": "Local"
-        }
-      },
       {
         "name": "2.4-micro-el8",
         "annotations": {
-          "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on CentOS 8 Stream. 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-apache",
-          "openshift.io/display-name": "Apache HTTP Server 2.4 Micro (CentOS 8 Stream)",
+          "openshift.io/display-name": "Apache HTTP Server 2.4-micro (CentOS Stream 8)",
           "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "sampleRepo": "https://github.com/sclorg/httpd-ex.git",
-          "supports": "httpd",
+          "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4-micro on CentOS Stream 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4-micro/README.md.",
+          "iconClass": "icon-httpd",
           "tags": "builder,httpd",
-          "version": "2.4"
+          "version": "2.4-micro",
+          "sampleRepo": "https://github.com/sclorg/httpd-ex.git"
         },
         "from": {
           "kind": "DockerImage",
@@ -149,40 +67,38 @@
         }
       },
       {
-        "name": "2.4-el7",
+        "name": "2.4-micro-el9",
         "annotations": {
-          "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on CentOS 7. 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-apache",
-          "openshift.io/display-name": "Apache HTTP Server 2.4 (CentOS 7)",
+          "openshift.io/display-name": "Apache HTTP Server 2.4-micro (CentOS Stream 9)",
           "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "sampleRepo": "https://github.com/sclorg/httpd-ex.git",
-          "supports": "httpd",
+          "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4-micro on CentOS Stream 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/httpd-container/blob/master/2.4-micro/README.md.",
+          "iconClass": "icon-httpd",
           "tags": "builder,httpd",
-          "version": "2.4"
+          "version": "2.4-micro",
+          "sampleRepo": "https://github.com/sclorg/httpd-ex.git"
         },
         "from": {
           "kind": "DockerImage",
-          "name": "quay.io/centos7/httpd-24-centos7:latest"
+          "name": "quay.io/sclorg/httpd-24-micro-c9s:latest"
         },
         "referencePolicy": {
           "type": "Local"
         }
       },
       {
-        "name": "2.4",
+        "name": "latest",
         "annotations": {
-          "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.",
-          "iconClass": "icon-apache",
-          "openshift.io/display-name": "Apache HTTP Server 2.4",
+          "openshift.io/display-name": "Apache HTTP Server 2.4 (Latest)",
           "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "sampleRepo": "https://github.com/sclorg/httpd-ex.git",
-          "supports": "httpd",
-          "tags": "builder,httpd,hidden",
-          "version": "2.4"
+          "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": "DockerImage",
-          "name": "registry.access.redhat.com/ubi9/httpd-24:latest"
+          "kind": "ImageStreamTag",
+          "name": "2.4-ubi9"
         },
         "referencePolicy": {
           "type": "Local"

diff --git a/imagestreams/httpd-rhel-aarch64.json b/imagestreams/httpd-rhel-aarch64.json
@@ -1,92 +1,89 @@
 {
-  "apiVersion": "image.openshift.io/v1",
   "kind": "ImageStream",
+  "apiVersion": "image.openshift.io/v1",
   "metadata": {
+    "name": "httpd",
     "annotations": {
-      "openshift.io/display-name": "Apache HTTP Server (httpd)"
-    },
-    "name": "httpd"
+      "openshift.io/display-name": "Apache HTTP Server"
+    }
   },
   "spec": {
     "tags": [
       {
+        "name": "2.4-ubi8",
         "annotations": {
-          "description": "Build and serve static content via Apache HTTP Server (httpd) on RHEL. 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 of Httpd available on OpenShift, including major version updates.",
-          "iconClass": "icon-apache",
-          "openshift.io/display-name": "Apache HTTP Server (Latest)",
+          "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 8)",
           "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "sampleRepo": "https://github.com/sclorg/httpd-ex.git",
-          "supports": "httpd",
-          "tags": "builder,httpd"
+          "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.",
+          "iconClass": "icon-httpd",
+          "tags": "builder,httpd",
+          "version": "2.4",
+          "sampleRepo": "https://github.com/sclorg/httpd-ex.git"
         },
         "from": {
-          "kind": "ImageStreamTag",
-          "name": "2.4-ubi8"
+          "kind": "DockerImage",
+          "name": "registry.redhat.io/ubi8/httpd-24:latest"
         },
         "referencePolicy": {
           "type": "Local"
-        },
-        "name": "latest"
+        }
       },
       {
+        "name": "2.4-ubi9",
         "annotations": {
-          "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.",
-          "iconClass": "icon-apache",
           "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 9)",
           "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "sampleRepo": "https://github.com/sclorg/httpd-ex.git",
-          "supports": "httpd",
+          "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.",
+          "iconClass": "icon-httpd",
           "tags": "builder,httpd",
-          "version": "2.4"
+          "version": "2.4",
+          "sampleRepo": "https://github.com/sclorg/httpd-ex.git"
         },
         "from": {
           "kind": "DockerImage",
           "name": "registry.redhat.io/ubi9/httpd-24:latest"
         },
         "referencePolicy": {
           "type": "Local"
-        },
-        "name": "2.4-ubi9"
+        }
       },
       {
+        "name": "2.4-el8",
         "annotations": {
-          "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 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.",
-          "iconClass": "icon-apache",
-          "openshift.io/display-name": "Apache HTTP Server 2.4 (UBI 8)",
+          "openshift.io/display-name": "Apache HTTP Server 2.4 (RHEL 8)",
           "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "sampleRepo": "https://github.com/sclorg/httpd-ex.git",
-          "supports": "httpd",
+          "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 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.",
+          "iconClass": "icon-httpd",
           "tags": "builder,httpd",
-          "version": "2.4"
+          "version": "2.4",
+          "sampleRepo": "https://github.com/sclorg/httpd-ex.git"
         },
         "from": {
           "kind": "DockerImage",
-          "name": "registry.redhat.io/ubi8/httpd-24:latest"
+          "name": "registry.redhat.io/rhel8/httpd-24:latest"
         },
         "referencePolicy": {
           "type": "Local"
-        },
-        "name": "2.4-ubi8"
+        }
       },
       {
+        "name": "latest",
         "annotations": {
-          "description": "Build and serve static content via Apache HTTP Server (httpd) 2.4 on RHEL 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.",
-          "iconClass": "icon-apache",
-          "openshift.io/display-name": "Apache HTTP Server 2.4 (RHEL 8)",
+          "openshift.io/display-name": "Apache HTTP Server 2.4 (Latest)",
           "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "sampleRepo": "https://github.com/sclorg/httpd-ex.git",
-          "supports": "httpd",
-          "tags": "builder,httpd,hidden",
-          "version": "2.4"
+          "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",
+          "iconClass": "icon-httpd",
+          "tags": "builder,httpd",
+          "version": "2.4",
+          "sampleRepo": "https://github.com/sclorg/httpd-ex.git"
         },
         "from": {
-          "kind": "DockerImage",
-          "name": "registry.redhat.io/rhel8/httpd-24"
+          "kind": "ImageStreamTag",
+          "name": "2.4-ubi8"
         },
         "referencePolicy": {
           "type": "Local"
-        },
-        "name": "2.4-el8"
+        }
       }
     ]
   }