From 82b2135be56ae35ef38ca8fb7369b0607e889263 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Fri, 22 Mar 2024 13:51:30 +0100 Subject: [PATCH 1/5] add github action for checking if imagestreams are properly regenerated --- .github/workflows/check-imagestreams.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/workflows/check-imagestreams.yml diff --git a/.github/workflows/check-imagestreams.yml b/.github/workflows/check-imagestreams.yml new file mode 100644 index 00000000..b8d0029e --- /dev/null +++ b/.github/workflows/check-imagestreams.yml @@ -0,0 +1,23 @@ +--- +name: Imagestreamfiles check +on: + issue_comment: + types: + - created + +permissions: + contents: read + statuses: write + +jobs: + check: + name: "Check imagestream generator generated files" + runs-on: ubuntu-20.04 + 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" From 72a6c6bc56d790800cfb9ef199491dffb12a4985 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Fri, 22 Mar 2024 13:51:54 +0100 Subject: [PATCH 2/5] add YAML config for imagestreams generator --- imagestreams/imagestreams.yaml | 40 ++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 imagestreams/imagestreams.yaml diff --git a/imagestreams/imagestreams.yaml b/imagestreams/imagestreams.yaml new file mode 100644 index 00000000..9a7e5dbe --- /dev/null +++ b/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] From f29f9997d549a30fd90342154d0afd2461c0584d Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Fri, 22 Mar 2024 13:53:30 +0100 Subject: [PATCH 3/5] add imagestrem files generated by imagestream generator --- imagestreams/postgresql-centos.json | 87 ++++++------- imagestreams/postgresql-rhel-aarch64.json | 87 ++++++------- imagestreams/postgresql-rhel.json | 148 +++++++++------------- 3 files changed, 146 insertions(+), 176 deletions(-) diff --git a/imagestreams/postgresql-centos.json b/imagestreams/postgresql-centos.json index db1ea9d9..c742b0cc 100644 --- a/imagestreams/postgresql-centos.json +++ b/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.\n", "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.\n", "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.\n", "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.\n", "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" @@ -85,7 +86,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 16 (CentOS Stream 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 16 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 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", "iconClass": "icon-postgresql", "tags": "database,postgresql", "version": "16" @@ -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.\n", "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.\n", "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.\n", "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\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" diff --git a/imagestreams/postgresql-rhel-aarch64.json b/imagestreams/postgresql-rhel-aarch64.json index 6c8821a3..dd51946d 100644 --- a/imagestreams/postgresql-rhel-aarch64.json +++ b/imagestreams/postgresql-rhel-aarch64.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 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL database on RHEL. 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 RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", "iconClass": "icon-postgresql", - "tags": "database,postgresql" + "tags": "database,postgresql", + "version": "10" }, "from": { - "kind": "ImageStreamTag", - "name": "13-el8" + "kind": "DockerImage", + "name": "registry.redhat.io/rhel8/postgresql-10:latest" }, "referencePolicy": { "type": "Local" } }, { - "name": "16-el9", + "name": "12-el8", "annotations": { - "openshift.io/display-name": "PostgreSQL 16 (RHEL 9)", + "openshift.io/display-name": "PostgreSQL 12 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 16 database on RHEL 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 RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", "iconClass": "icon-postgresql", "tags": "database,postgresql", - "version": "16" + "version": "12" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel9/postgresql-16:latest" + "name": "registry.redhat.io/rhel8/postgresql-12:latest" }, "referencePolicy": { "type": "Local" } }, { - "name": "15-el9", + "name": "13-el8", "annotations": { - "openshift.io/display-name": "PostgreSQL 15 (RHEL 9)", + "openshift.io/display-name": "PostgreSQL 13 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 15 database on RHEL 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 RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", "iconClass": "icon-postgresql", "tags": "database,postgresql", - "version": "15" + "version": "13" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel9/postgresql-15:latest" + "name": "registry.redhat.io/rhel8/postgresql-13:latest" }, "referencePolicy": { "type": "Local" } }, { - "name": "13-el9", + "name": "15-el8", "annotations": { - "openshift.io/display-name": "PostgreSQL 13 (RHEL 9)", + "openshift.io/display-name": "PostgreSQL 15 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 13 database on RHEL 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 RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", "iconClass": "icon-postgresql", "tags": "database,postgresql", - "version": "13" + "version": "15" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel9/postgresql-13:latest" + "name": "registry.redhat.io/rhel8/postgresql-15:latest" }, "referencePolicy": { "type": "Local" @@ -85,7 +86,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 16 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 16 database on RHEL 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 RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", "iconClass": "icon-postgresql", "tags": "database,postgresql", "version": "16" @@ -99,72 +100,72 @@ } }, { - "name": "15-el8", + "name": "13-el9", "annotations": { - "openshift.io/display-name": "PostgreSQL 15 (RHEL 8)", + "openshift.io/display-name": "PostgreSQL 13 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 15 database on RHEL 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 RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", "iconClass": "icon-postgresql", "tags": "database,postgresql", - "version": "15" + "version": "13" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-15:latest" + "name": "registry.redhat.io/rhel9/postgresql-13:latest" }, "referencePolicy": { "type": "Local" } }, { - "name": "13-el8", + "name": "15-el9", "annotations": { - "openshift.io/display-name": "PostgreSQL 13 (RHEL 8)", + "openshift.io/display-name": "PostgreSQL 15 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 13 database on RHEL 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 RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", "iconClass": "icon-postgresql", "tags": "database,postgresql", - "version": "13" + "version": "15" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-13:latest" + "name": "registry.redhat.io/rhel9/postgresql-15:latest" }, "referencePolicy": { "type": "Local" } }, { - "name": "12-el8", + "name": "16-el9", "annotations": { - "openshift.io/display-name": "PostgreSQL 12 (RHEL 8)", + "openshift.io/display-name": "PostgreSQL 16 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 12 database on RHEL 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 RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", "iconClass": "icon-postgresql", "tags": "database,postgresql", - "version": "12" + "version": "16" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-12:latest" + "name": "registry.redhat.io/rhel9/postgresql-16:latest" }, "referencePolicy": { "type": "Local" } }, { - "name": "10-el8", + "name": "latest", "annotations": { - "openshift.io/display-name": "PostgreSQL 10 (RHEL 8)", + "openshift.io/display-name": "PostgreSQL 13 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 10 database on RHEL 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 RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n\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": "13" }, "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-10:latest" + "kind": "ImageStreamTag", + "name": "13-el8" }, "referencePolicy": { "type": "Local" diff --git a/imagestreams/postgresql-rhel.json b/imagestreams/postgresql-rhel.json index 45d44452..fecf5d23 100644 --- a/imagestreams/postgresql-rhel.json +++ b/imagestreams/postgresql-rhel.json @@ -10,104 +10,90 @@ "spec": { "tags": [ { - "name": "latest", - "annotations": { - "openshift.io/display-name": "PostgreSQL (Latest)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL database on RHEL. 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.", - "iconClass": "icon-postgresql", - "tags": "database,postgresql" - }, - "from": { - "kind": "ImageStreamTag", - "name": "15-el8" - } - }, - { - "name": "16-el9", + "name": "10-el7", "annotations": { - "openshift.io/display-name": "PostgreSQL 16 (RHEL 9)", + "openshift.io/display-name": "PostgreSQL 10 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 16 database on RHEL 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 10 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", "iconClass": "icon-postgresql", "tags": "database,postgresql", - "version": "16" + "version": "10" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel9/postgresql-16:latest" + "name": "registry.redhat.io/rhscl/postgresql-10-rhel7:latest" }, "referencePolicy": { "type": "Local" } }, { - "name": "15-el9", + "name": "12-el7", "annotations": { - "openshift.io/display-name": "PostgreSQL 15 (RHEL 9)", + "openshift.io/display-name": "PostgreSQL 12 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 15 database on RHEL 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 RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", "iconClass": "icon-postgresql", "tags": "database,postgresql", - "version": "15" + "version": "12" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel9/postgresql-15:latest" + "name": "registry.redhat.io/rhscl/postgresql-12-rhel7:latest" }, "referencePolicy": { "type": "Local" } }, { - "name": "16-el8", + "name": "13-el7", "annotations": { - "openshift.io/display-name": "PostgreSQL 16 (RHEL 8)", + "openshift.io/display-name": "PostgreSQL 13 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 16 database on RHEL 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 RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", "iconClass": "icon-postgresql", "tags": "database,postgresql", - "version": "16" + "version": "13" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-16:latest" + "name": "registry.redhat.io/rhscl/postgresql-13-rhel7:latest" }, "referencePolicy": { "type": "Local" } }, { - "name": "15-el8", + "name": "10-el8", "annotations": { - "openshift.io/display-name": "PostgreSQL 15 (RHEL 8)", + "openshift.io/display-name": "PostgreSQL 10 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 15 database on RHEL 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 10 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", "iconClass": "icon-postgresql", "tags": "database,postgresql", - "version": "15" + "version": "10" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-15:latest" + "name": "registry.redhat.io/rhel8/postgresql-10:latest" }, "referencePolicy": { "type": "Local" } }, { - "name": "13-el9", + "name": "12-el8", "annotations": { - "openshift.io/display-name": "PostgreSQL 13 (RHEL 9)", + "openshift.io/display-name": "PostgreSQL 12 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 13 database on RHEL 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 RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", "iconClass": "icon-postgresql", "tags": "database,postgresql", - "version": "13" + "version": "12" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel9/postgresql-13:latest" + "name": "registry.redhat.io/rhel8/postgresql-12:latest" }, "referencePolicy": { "type": "Local" @@ -118,7 +104,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 13 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 13 database on RHEL 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 RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", "iconClass": "icon-postgresql", "tags": "database,postgresql", "version": "13" @@ -132,126 +118,108 @@ } }, { - "name": "13-el7", + "name": "15-el8", "annotations": { - "openshift.io/display-name": "PostgreSQL 13 (RHEL 7)", + "openshift.io/display-name": "PostgreSQL 15 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 13 database on RHEL 7. 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 RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", "iconClass": "icon-postgresql", "tags": "database,postgresql", - "version": "13" + "version": "15" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/postgresql-13-rhel7:latest" + "name": "registry.redhat.io/rhel8/postgresql-15:latest" }, "referencePolicy": { "type": "Local" } }, { - "name": "12-el8", + "name": "16-el8", "annotations": { - "openshift.io/display-name": "PostgreSQL 12 (RHEL 8)", + "openshift.io/display-name": "PostgreSQL 16 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 12 database on RHEL 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 RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", "iconClass": "icon-postgresql", "tags": "database,postgresql", - "version": "12" + "version": "16" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-12:latest" + "name": "registry.redhat.io/rhel8/postgresql-16:latest" }, "referencePolicy": { "type": "Local" } }, { - "name": "12-el7", + "name": "13-el9", "annotations": { - "openshift.io/display-name": "PostgreSQL 12 (RHEL 7)", + "openshift.io/display-name": "PostgreSQL 13 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 12 database on RHEL 7. 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 RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", "iconClass": "icon-postgresql", "tags": "database,postgresql", - "version": "12" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/postgresql-12-rhel7:latest" - }, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "12", - "annotations": { - "openshift.io/display-name": "PostgreSQL (Ephemeral) 12", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 12 database on RHEL 7. 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,hidden", - "version": "12" + "version": "13" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/postgresql-12-rhel7:latest" + "name": "registry.redhat.io/rhel9/postgresql-13:latest" }, "referencePolicy": { "type": "Local" } }, { - "name": "10-el8", + "name": "15-el9", "annotations": { - "openshift.io/display-name": "PostgreSQL 10 (RHEL 8)", + "openshift.io/display-name": "PostgreSQL 15 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 10 database on RHEL 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 RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", "iconClass": "icon-postgresql", "tags": "database,postgresql", - "version": "10" + "version": "15" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/postgresql-10:latest" + "name": "registry.redhat.io/rhel9/postgresql-15:latest" }, "referencePolicy": { "type": "Local" } }, { - "name": "10-el7", + "name": "16-el9", "annotations": { - "openshift.io/display-name": "PostgreSQL 10 (RHEL 7)", + "openshift.io/display-name": "PostgreSQL 16 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 10 database on RHEL 7. 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 RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", "iconClass": "icon-postgresql", "tags": "database,postgresql", - "version": "10" + "version": "16" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/postgresql-10-rhel7:latest" + "name": "registry.redhat.io/rhel9/postgresql-16:latest" }, "referencePolicy": { "type": "Local" } }, { - "name": "10", + "name": "latest", "annotations": { - "openshift.io/display-name": "PostgreSQL (Ephemeral) 10", + "openshift.io/display-name": "PostgreSQL 15 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 10 database on RHEL 7. 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 RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n\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,hidden", - "version": "10" + "tags": "database,postgresql", + "version": "15" }, "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/postgresql-10-rhel7:latest" + "kind": "ImageStreamTag", + "name": "15-el8" }, "referencePolicy": { "type": "Local" From b3130aac3f9296cad9bdc14f8e66623ceabdeac9 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Mon, 25 Mar 2024 12:06:05 +0100 Subject: [PATCH 4/5] imagestreams.yaml, use >- for description in yaml Previously used '>' was appending newline at the end of string. --- imagestreams/imagestreams.yaml | 2 +- imagestreams/postgresql-centos.json | 18 ++++++++--------- imagestreams/postgresql-rhel-aarch64.json | 18 ++++++++--------- imagestreams/postgresql-rhel.json | 24 +++++++++++------------ 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/imagestreams/imagestreams.yaml b/imagestreams/imagestreams.yaml index 9a7e5dbe..60d9c120 100644 --- a/imagestreams/imagestreams.yaml +++ b/imagestreams/imagestreams.yaml @@ -3,7 +3,7 @@ pretty_name: PostgreSQL sample_repo: "" category: database - description: > + description: >- Provides a PostgreSQL APP_VERSION database on DISTRO_NAME. For more information about using this database image, including OpenShift considerations, diff --git a/imagestreams/postgresql-centos.json b/imagestreams/postgresql-centos.json index c742b0cc..6ced4653 100644 --- a/imagestreams/postgresql-centos.json +++ b/imagestreams/postgresql-centos.json @@ -14,7 +14,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 10 (CentOS Stream 8)", "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.\n", + "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", "version": "10" @@ -32,7 +32,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 12 (CentOS Stream 8)", "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.\n", + "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": "12" @@ -50,7 +50,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 13 (CentOS Stream 8)", "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.\n", + "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": "13" @@ -68,7 +68,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 15 (CentOS Stream 8)", "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.\n", + "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": "15" @@ -86,7 +86,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 16 (CentOS Stream 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 16 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.\n", + "description": "Provides a PostgreSQL 16 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" @@ -104,7 +104,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 13 (CentOS Stream 9)", "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.\n", + "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": "13" @@ -122,7 +122,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 15 (CentOS Stream 9)", "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.\n", + "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": "15" @@ -140,7 +140,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 16 (CentOS Stream 9)", "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.\n", + "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": "16" @@ -158,7 +158,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 15 (Latest)", "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.\n\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": "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": "15" diff --git a/imagestreams/postgresql-rhel-aarch64.json b/imagestreams/postgresql-rhel-aarch64.json index dd51946d..b6859cf9 100644 --- a/imagestreams/postgresql-rhel-aarch64.json +++ b/imagestreams/postgresql-rhel-aarch64.json @@ -14,7 +14,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 10 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 10 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", + "description": "Provides a PostgreSQL 10 database on RHEL 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": "10" @@ -32,7 +32,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 12 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 12 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", + "description": "Provides a PostgreSQL 12 database on RHEL 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": "12" @@ -50,7 +50,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 13 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 13 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", + "description": "Provides a PostgreSQL 13 database on RHEL 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" @@ -68,7 +68,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 15 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 15 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", + "description": "Provides a PostgreSQL 15 database on RHEL 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" @@ -86,7 +86,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 16 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 16 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", + "description": "Provides a PostgreSQL 16 database on RHEL 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" @@ -104,7 +104,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 13 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 13 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", + "description": "Provides a PostgreSQL 13 database on RHEL 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" @@ -122,7 +122,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 15 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 15 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", + "description": "Provides a PostgreSQL 15 database on RHEL 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" @@ -140,7 +140,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 16 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 16 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", + "description": "Provides a PostgreSQL 16 database on RHEL 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": "16" @@ -158,7 +158,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 13 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 13 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n\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": "Provides a PostgreSQL 13 database on RHEL 8. 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": "13" diff --git a/imagestreams/postgresql-rhel.json b/imagestreams/postgresql-rhel.json index fecf5d23..a7df5856 100644 --- a/imagestreams/postgresql-rhel.json +++ b/imagestreams/postgresql-rhel.json @@ -14,7 +14,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 10 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 10 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", + "description": "Provides a PostgreSQL 10 database on RHEL 7. 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": "10" @@ -32,7 +32,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 12 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 12 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", + "description": "Provides a PostgreSQL 12 database on RHEL 7. 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" @@ -50,7 +50,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 13 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 13 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", + "description": "Provides a PostgreSQL 13 database on RHEL 7. 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" @@ -68,7 +68,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 10 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 10 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", + "description": "Provides a PostgreSQL 10 database on RHEL 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": "10" @@ -86,7 +86,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 12 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 12 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", + "description": "Provides a PostgreSQL 12 database on RHEL 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": "12" @@ -104,7 +104,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 13 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 13 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", + "description": "Provides a PostgreSQL 13 database on RHEL 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" @@ -122,7 +122,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 15 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 15 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", + "description": "Provides a PostgreSQL 15 database on RHEL 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" @@ -140,7 +140,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 16 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 16 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", + "description": "Provides a PostgreSQL 16 database on RHEL 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" @@ -158,7 +158,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 13 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 13 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", + "description": "Provides a PostgreSQL 13 database on RHEL 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" @@ -176,7 +176,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 15 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 15 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", + "description": "Provides a PostgreSQL 15 database on RHEL 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" @@ -194,7 +194,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 16 (RHEL 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 16 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n", + "description": "Provides a PostgreSQL 16 database on RHEL 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": "16" @@ -212,7 +212,7 @@ "annotations": { "openshift.io/display-name": "PostgreSQL 15 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a PostgreSQL 15 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.\n\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": "Provides a PostgreSQL 15 database on RHEL 8. 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": "15" From e9671b9b541e65e99560d3c57e58c89e250c0f8d Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Tue, 26 Mar 2024 16:14:20 +0100 Subject: [PATCH 5/5] make imagestream check as part of openshift tests --- .github/workflows/check-imagestreams.yml | 23 ------------------ .github/workflows/openshift-tests.yml | 31 ++++++++++++++---------- 2 files changed, 18 insertions(+), 36 deletions(-) delete mode 100644 .github/workflows/check-imagestreams.yml diff --git a/.github/workflows/check-imagestreams.yml b/.github/workflows/check-imagestreams.yml deleted file mode 100644 index b8d0029e..00000000 --- a/.github/workflows/check-imagestreams.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -name: Imagestreamfiles check -on: - issue_comment: - types: - - created - -permissions: - contents: read - statuses: write - -jobs: - check: - name: "Check imagestream generator generated files" - runs-on: ubuntu-20.04 - 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" diff --git a/.github/workflows/openshift-tests.yml b/.github/workflows/openshift-tests.yml index 1f6560ff..e63daf1b 100644 --- a/.github/workflows/openshift-tests.yml +++ b/.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: