add YAML config for imagestreams generator

.github/workflows/openshift-tests.yml

@@ -3,16 +3,24 @@ on:
     types:
       - created
 jobs:
-  distgen-check:
-    name: "Check distgen generated files"
-    runs-on: ubuntu-20.04
-    concurrency:
-      group: ocp-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }}
-      cancel-in-progress: true
+  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"
+
+  distgen-check:
+    name: "Check distgen generated files"
+    runs-on: ubuntu-latest
+    needs: check-imagestreams
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -31,20 +39,17 @@ jobs:
 
   openshift-tests:
     needs: distgen-check
-    # 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
+    concurrency:
+      group: ocp-${{ github.event.issue.number }}-${{ matrix.version }}-${{ matrix.os_test }}
+      cancel-in-progress: true
     strategy:
       fail-fast: false
       matrix:
         version: [ "10", "11", "12", "13", "15", "16" ]
         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:

imagestreams/imagestreams.yaml

@@ -0,0 +1,40 @@
+---
+- name: postgresql
+  pretty_name: PostgreSQL
+  sample_repo: ""
+  category: database
+  description: >-
+    Provides a PostgreSQL APP_VERSION database on DISTRO_NAME.
+    For more information about using this database image,
+    including OpenShift considerations,
+    see https://github.com/sclorg/postgresql-container/blob/master/README.md.
+  imagestream_files:
+  - filename: postgresql-centos.json
+    latest: "15-el9"
+    distros:
+      - name: CentOS Stream 8
+        app_versions: [10, 12, 13, 15, 16]
+
+      - name: CentOS Stream 9
+        app_versions: [13, 15, 16]
+
+  - filename: postgresql-rhel.json
+    latest: "15-el8"
+    distros:
+      - name: RHEL 7
+        app_versions: [10, 12, 13]
+
+      - name: RHEL 8
+        app_versions: [10, 12, 13, 15, 16]
+
+      - name: RHEL 9
+        app_versions: [13, 15, 16]
+
+  - filename: postgresql-rhel-aarch64.json
+    latest: "13-el8"
+    distros:
+      - name: RHEL 8
+        app_versions: [10, 12, 13, 15, 16]
+
+      - name: RHEL 9
+        app_versions: [13, 15, 16]

imagestreams/postgresql-centos.json

@@ -10,71 +10,72 @@
   "spec": {
     "tags": [
       {
-        "name": "latest",
+        "name": "10-el8",
         "annotations": {
-          "openshift.io/display-name": "PostgreSQL (Latest)",
+          "openshift.io/display-name": "PostgreSQL 10 (CentOS Stream 8)",
           "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "description": "Provides a PostgreSQL database on CentOS Stream. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of PostgreSQL available on OpenShift, including major version updates.",
+          "description": "Provides a PostgreSQL 10 database on CentOS Stream 8. 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"
+          "tags": "database,postgresql",
+          "version": "10"
         },
         "from": {
-          "kind": "ImageStreamTag",
-          "name": "15-el9"
+          "kind": "DockerImage",
+          "name": "quay.io/sclorg/postgresql-10-c8s:latest"
         },
         "referencePolicy": {
           "type": "Local"
         }
       },
       {
-        "name": "16-el9",
+        "name": "12-el8",
         "annotations": {
-          "openshift.io/display-name": "PostgreSQL 16 (CentOS Stream 9)",
+          "openshift.io/display-name": "PostgreSQL 12 (CentOS Stream 8)",
           "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "description": "Provides a PostgreSQL 16 database on CentOS Stream 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.",
+          "description": "Provides a PostgreSQL 12 database on CentOS Stream 8. 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"
+          "version": "12"
         },
         "from": {
           "kind": "DockerImage",
-          "name": "quay.io/sclorg/postgresql-16-c9s:latest"
+          "name": "quay.io/sclorg/postgresql-12-c8s:latest"
         },
         "referencePolicy": {
           "type": "Local"
         }
       },
       {
-        "name": "15-el9",
+        "name": "13-el8",
         "annotations": {
-          "openshift.io/display-name": "PostgreSQL 15 (CentOS Stream 9)",
+          "openshift.io/display-name": "PostgreSQL 13 (CentOS Stream 8)",
           "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "description": "Provides a PostgreSQL 15 database on CentOS Stream 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.",
+          "description": "Provides a PostgreSQL 13 database on CentOS Stream 8. 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": "15"
+          "version": "13"
         },
         "from": {
           "kind": "DockerImage",
-          "name": "quay.io/sclorg/postgresql-15-c9s:latest"
+          "name": "quay.io/sclorg/postgresql-13-c8s:latest"
         },
         "referencePolicy": {
           "type": "Local"
         }
       },
       {
-        "name": "13-el9",
+        "name": "15-el8",
         "annotations": {
-          "openshift.io/display-name": "PostgreSQL 13 (CentOS Stream 9)",
+          "openshift.io/display-name": "PostgreSQL 15 (CentOS Stream 8)",
           "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "description": "Provides a PostgreSQL 13 database on CentOS Stream 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.",
+          "description": "Provides a PostgreSQL 15 database on CentOS Stream 8. 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": "13"
+          "version": "15"
         },
         "from": {
           "kind": "DockerImage",
-          "name": "quay.io/sclorg/postgresql-13-c9s:latest"
+          "name": "quay.io/sclorg/postgresql-15-c8s:latest"
         },
         "referencePolicy": {
           "type": "Local"
@@ -99,72 +100,72 @@
         }
       },
       {
-        "name": "15-el8",
+        "name": "13-el9",
         "annotations": {
-          "openshift.io/display-name": "PostgreSQL 15 (CentOS Stream 8)",
+          "openshift.io/display-name": "PostgreSQL 13 (CentOS Stream 9)",
           "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "description": "Provides a PostgreSQL 15 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.",
+          "description": "Provides a PostgreSQL 13 database on CentOS Stream 9. 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": "15"
+          "version": "13"
         },
         "from": {
           "kind": "DockerImage",
-          "name": "quay.io/sclorg/postgresql-15-c8s:latest"
+          "name": "quay.io/sclorg/postgresql-13-c9s:latest"
         },
         "referencePolicy": {
           "type": "Local"
         }
       },
       {
-        "name": "13-el8",
+        "name": "15-el9",
         "annotations": {
-          "openshift.io/display-name": "PostgreSQL 13 (CentOS Stream 8)",
+          "openshift.io/display-name": "PostgreSQL 15 (CentOS Stream 9)",
           "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "description": "Provides a PostgreSQL 13 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.",
+          "description": "Provides a PostgreSQL 15 database on CentOS Stream 9. 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": "13"
+          "version": "15"
         },
         "from": {
           "kind": "DockerImage",
-          "name": "quay.io/sclorg/postgresql-13-c8s:latest"
+          "name": "quay.io/sclorg/postgresql-15-c9s:latest"
         },
         "referencePolicy": {
           "type": "Local"
         }
       },
       {
-        "name": "12-el8",
+        "name": "16-el9",
         "annotations": {
-          "openshift.io/display-name": "PostgreSQL 12 (CentOS Stream 8)",
+          "openshift.io/display-name": "PostgreSQL 16 (CentOS Stream 9)",
           "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "description": "Provides a PostgreSQL 12 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.",
+          "description": "Provides a PostgreSQL 16 database on CentOS Stream 9. 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": "12"
+          "version": "16"
         },
         "from": {
           "kind": "DockerImage",
-          "name": "quay.io/sclorg/postgresql-12-c8s:latest"
+          "name": "quay.io/sclorg/postgresql-16-c9s:latest"
         },
         "referencePolicy": {
           "type": "Local"
         }
       },
       {
-        "name": "10-el8",
+        "name": "latest",
         "annotations": {
-          "openshift.io/display-name": "PostgreSQL 10 (CentOS Stream 8)",
+          "openshift.io/display-name": "PostgreSQL 15 (Latest)",
           "openshift.io/provider-display-name": "Red Hat, Inc.",
-          "description": "Provides a PostgreSQL 10 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.",
+          "description": "Provides a PostgreSQL 15 database on CentOS Stream 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/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-postgresql",
           "tags": "database,postgresql",
-          "version": "10"
+          "version": "15"
         },
         "from": {
-          "kind": "DockerImage",
-          "name": "quay.io/sclorg/postgresql-10-c8s:latest"
+          "kind": "ImageStreamTag",
+          "name": "15-el9"
         },
         "referencePolicy": {
           "type": "Local"