From 719f6b87123f977fb11f3b225810b1e3923255d1 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Thu, 4 Apr 2024 13:46:05 +0200 Subject: [PATCH 1/3] add YAML conf for imagestream generator --- imagestreams/imagestreams.yaml | 39 ++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 imagestreams/imagestreams.yaml diff --git a/imagestreams/imagestreams.yaml b/imagestreams/imagestreams.yaml new file mode 100644 index 0000000..6767083 --- /dev/null +++ b/imagestreams/imagestreams.yaml @@ -0,0 +1,39 @@ +--- +- name: mariadb + pretty_name: MariaDB + sample_repo: https://github.com/sclorg/httpd-ex.git + category: database + description: >- + Provides a MariaDB APP_VERSION database on DISTRO_NAME. For more information + about using this database image, including OpenShift considerations, see + https://github.com/sclorg/mariadb-container/tree/master/APP_VERSION/README.md. + imagestream_files: + - filename: mariadb-centos.json + latest: "10.5-el9" + distros: + - name: CentOS Stream 8 + app_versions: ["10.3", "10.5"] + + - name: CentOS Stream 9 + app_versions: ["10.5"] + + - filename: mariadb-rhel.json + latest: "10.5-el8" + distros: + - name: RHEL 7 + app_versions: ["10.3", "10.5"] + + - name: RHEL 8 + app_versions: ["10.3", "10.5"] + + - name: RHEL 9 + app_versions: ["10.5"] + + - filename: mariadb-rhel-aarch64.json + latest: "10.5-el8" + distros: + - name: RHEL 8 + app_versions: ["10.3", "10.5"] + + - name: RHEL 9 + app_versions: ["10.5"] From ff36960d1bef9481d289fe7b861bb76a3dad8b3a Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Thu, 4 Apr 2024 13:49:14 +0200 Subject: [PATCH 2/3] add github action for checking imagestreams --- .github/workflows/openshift-tests.yml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/openshift-tests.yml b/.github/workflows/openshift-tests.yml index 9e52c7e..65097c3 100644 --- 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: From 87affb3490c42798e49dd8039477b678dc9b0286 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Thu, 4 Apr 2024 13:51:07 +0200 Subject: [PATCH 3/3] add files generated by imagestreams generator --- imagestreams/mariadb-centos.json | 147 ++++--------------------- imagestreams/mariadb-rhel-aarch64.json | 45 ++++---- imagestreams/mariadb-rhel.json | 87 +++++++-------- 3 files changed, 85 insertions(+), 194 deletions(-) diff --git a/imagestreams/mariadb-centos.json b/imagestreams/mariadb-centos.json index 86fe272..ac449a2 100644 --- a/imagestreams/mariadb-centos.json +++ b/imagestreams/mariadb-centos.json @@ -10,53 +10,19 @@ "spec": { "tags": [ { - "name": "latest", - "annotations": { - "openshift.io/display-name": "MariaDB (Latest)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a MariaDB database on CentOS. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of MariaDB available on OpenShift, including major version updates.", - "iconClass": "icon-mariadb", - "tags": "database,mariadb" - }, - "from": { - "kind": "ImageStreamTag", - "name": "10.5-el9" - }, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "10.5-fc", - "annotations": { - "openshift.io/display-name": "MariaDB 10.5 (Fedora)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a MariaDB 10.5 database on Fedora. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", - "iconClass": "icon-mariadb", - "tags": "database,mariadb", - "version": "10.5" - }, - "from": { - "kind": "DockerImage", - "name": "quay.io/fedora/mariadb-105:latest" - }, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "10.5-el9", + "name": "10.3-el8", "annotations": { - "openshift.io/display-name": "MariaDB 10.5 (CentOS 9 Stream)", + "openshift.io/display-name": "MariaDB 10.3 (CentOS Stream 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a MariaDB 10.5 database on CentOS 9 Stream. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", + "description": "Provides a MariaDB 10.3 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", "iconClass": "icon-mariadb", "tags": "database,mariadb", - "version": "10.5" + "version": "10.3", + "sampleRepo": "https://github.com/sclorg/httpd-ex.git" }, "from": { "kind": "DockerImage", - "name": "quay.io/sclorg/mariadb-105-c9s:latest" + "name": "quay.io/sclorg/mariadb-103-c8s:latest" }, "referencePolicy": { "type": "Local" @@ -65,12 +31,13 @@ { "name": "10.5-el8", "annotations": { - "openshift.io/display-name": "MariaDB 10.5 (CentOS 8 Stream)", + "openshift.io/display-name": "MariaDB 10.5 (CentOS Stream 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a MariaDB 10.5 database on CentOS 8 Stream. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", + "description": "Provides a MariaDB 10.5 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", "iconClass": "icon-mariadb", "tags": "database,mariadb", - "version": "10.5" + "version": "10.5", + "sampleRepo": "https://github.com/sclorg/httpd-ex.git" }, "from": { "kind": "DockerImage", @@ -81,32 +48,15 @@ } }, { - "name": "10.5-el7", - "annotations": { - "openshift.io/display-name": "MariaDB 10.5 (CentOS 7)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a MariaDB 10.5 database on CentOS 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", - "iconClass": "icon-mariadb", - "tags": "database,mariadb", - "version": "10.5" - }, - "from": { - "kind": "DockerImage", - "name": "quay.io/centos7/mariadb-105-centos7:latest" - }, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "10.5", + "name": "10.5-el9", "annotations": { - "openshift.io/display-name": "MariaDB 10.5", + "openshift.io/display-name": "MariaDB 10.5 (CentOS Stream 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a MariaDB 10.5 database on CentOS 9 Stream. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", + "description": "Provides a MariaDB 10.5 database on CentOS Stream 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", "iconClass": "icon-mariadb", "tags": "database,mariadb", - "version": "10.5" + "version": "10.5", + "sampleRepo": "https://github.com/sclorg/httpd-ex.git" }, "from": { "kind": "DockerImage", @@ -117,72 +67,19 @@ } }, { - "name": "10.3-fc", - "annotations": { - "openshift.io/display-name": "MariaDB 10.3 (Fedora)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a MariaDB 10.5 database on Fedora. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", - "iconClass": "icon-mariadb", - "tags": "database,mariadb", - "version": "10.3" - }, - "from": { - "kind": "DockerImage", - "name": "quay.io/fedora/mariadb-103:latest" - }, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "10.3-el8", - "annotations": { - "openshift.io/display-name": "MariaDB 10.3 (CentOS 8 Stream)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a MariaDB 10.5 database on CentOS 8 Stream. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", - "iconClass": "icon-mariadb", - "tags": "database,mariadb", - "version": "10.3" - }, - "from": { - "kind": "DockerImage", - "name": "quay.io/sclorg/mariadb-103-c8s:latest" - }, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "10.3-el7", + "name": "latest", "annotations": { - "openshift.io/display-name": "MariaDB 10.3 (CentOS 7)", + "openshift.io/display-name": "MariaDB 10.5 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a MariaDB 10.3 database on CentOS 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", + "description": "Provides a MariaDB 10.5 database on CentOS Stream 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/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-mariadb", "tags": "database,mariadb", - "version": "10.3" - }, - "from": { - "kind": "DockerImage", - "name": "quay.io/centos7/mariadb-103-centos7:latest" - }, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "10.3", - "annotations": { - "openshift.io/display-name": "MariaDB 10.3", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a MariaDB 10.3 database on CentOS 8 Stream. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", - "iconClass": "icon-mariadb", - "tags": "database,mariadb,hidden", - "version": "10.3" + "version": "10.5", + "sampleRepo": "https://github.com/sclorg/httpd-ex.git" }, "from": { - "kind": "DockerImage", - "name": "quay.io/sclorg/mariadb-103-c8s:latest" + "kind": "ImageStreamTag", + "name": "10.5-el9" }, "referencePolicy": { "type": "Local" diff --git a/imagestreams/mariadb-rhel-aarch64.json b/imagestreams/mariadb-rhel-aarch64.json index dd413dc..1fcc7b6 100644 --- a/imagestreams/mariadb-rhel-aarch64.json +++ b/imagestreams/mariadb-rhel-aarch64.json @@ -9,23 +9,6 @@ }, "spec": { "tags": [ - { - "name": "latest", - "annotations": { - "openshift.io/display-name": "MariaDB (Latest)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a MariaDB database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of MariaDB available on OpenShift, including major version updates.", - "iconClass": "icon-mariadb", - "tags": "database,mariadb" - }, - "from": { - "kind": "ImageStreamTag", - "name": "10.5-el8" - }, - "referencePolicy": { - "type": "Local" - } - }, { "name": "10.3-el8", "annotations": { @@ -34,7 +17,8 @@ "description": "Provides a MariaDB 10.3 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", "iconClass": "icon-mariadb", "tags": "database,mariadb", - "version": "10.3" + "version": "10.3", + "sampleRepo": "https://github.com/sclorg/httpd-ex.git" }, "from": { "kind": "DockerImage", @@ -52,7 +36,8 @@ "description": "Provides a MariaDB 10.5 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", "iconClass": "icon-mariadb", "tags": "database,mariadb", - "version": "10.5" + "version": "10.5", + "sampleRepo": "https://github.com/sclorg/httpd-ex.git" }, "from": { "kind": "DockerImage", @@ -70,7 +55,8 @@ "description": "Provides a MariaDB 10.5 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", "iconClass": "icon-mariadb", "tags": "database,mariadb", - "version": "10.5" + "version": "10.5", + "sampleRepo": "https://github.com/sclorg/httpd-ex.git" }, "from": { "kind": "DockerImage", @@ -79,6 +65,25 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "latest", + "annotations": { + "openshift.io/display-name": "MariaDB 10.5 (Latest)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "description": "Provides a MariaDB 10.5 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/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-mariadb", + "tags": "database,mariadb", + "version": "10.5", + "sampleRepo": "https://github.com/sclorg/httpd-ex.git" + }, + "from": { + "kind": "ImageStreamTag", + "name": "10.5-el8" + }, + "referencePolicy": { + "type": "Local" + } } ] } diff --git a/imagestreams/mariadb-rhel.json b/imagestreams/mariadb-rhel.json index e541c7e..6f3b5ed 100644 --- a/imagestreams/mariadb-rhel.json +++ b/imagestreams/mariadb-rhel.json @@ -9,41 +9,6 @@ }, "spec": { "tags": [ - { - "name": "latest", - "annotations": { - "openshift.io/display-name": "MariaDB (Latest)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a MariaDB database on RHEL. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of MariaDB available on OpenShift, including major version updates.", - "iconClass": "icon-mariadb", - "tags": "database,mariadb" - }, - "from": { - "kind": "ImageStreamTag", - "name": "10.5-el8" - }, - "referencePolicy": { - "type": "Local" - } - }, - { - "name": "10.3-el8", - "annotations": { - "openshift.io/display-name": "MariaDB 10.3 (RHEL 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a MariaDB 10.3 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", - "iconClass": "icon-mariadb", - "tags": "database,mariadb", - "version": "10.3" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/rhel8/mariadb-103:latest" - }, - "referencePolicy": { - "type": "Local" - } - }, { "name": "10.3-el7", "annotations": { @@ -52,7 +17,8 @@ "description": "Provides a MariaDB 10.3 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", "iconClass": "icon-mariadb", "tags": "database,mariadb", - "version": "10.3" + "version": "10.3", + "sampleRepo": "https://github.com/sclorg/httpd-ex.git" }, "from": { "kind": "DockerImage", @@ -63,36 +29,38 @@ } }, { - "name": "10.3", + "name": "10.5-el7", "annotations": { - "openshift.io/display-name": "MariaDB 10.3", + "openshift.io/display-name": "MariaDB 10.5 (RHEL 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a MariaDB 10.3 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", + "description": "Provides a MariaDB 10.5 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", "iconClass": "icon-mariadb", - "tags": "database,mariadb,hidden", - "version": "10.3" + "tags": "database,mariadb", + "version": "10.5", + "sampleRepo": "https://github.com/sclorg/httpd-ex.git" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/mariadb-103-rhel7:latest" + "name": "registry.redhat.io/rhscl/mariadb-105-rhel7:latest" }, "referencePolicy": { "type": "Local" } }, { - "name": "10.5-el7", + "name": "10.3-el8", "annotations": { - "openshift.io/display-name": "MariaDB 10.5 (RHEL 7)", + "openshift.io/display-name": "MariaDB 10.3 (RHEL 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Provides a MariaDB 10.5 database on RHEL 7. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", + "description": "Provides a MariaDB 10.3 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.", "iconClass": "icon-mariadb", "tags": "database,mariadb", - "version": "10.5" + "version": "10.3", + "sampleRepo": "https://github.com/sclorg/httpd-ex.git" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/mariadb-105-rhel7:latest" + "name": "registry.redhat.io/rhel8/mariadb-103:latest" }, "referencePolicy": { "type": "Local" @@ -106,7 +74,8 @@ "description": "Provides a MariaDB 10.5 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", "iconClass": "icon-mariadb", "tags": "database,mariadb", - "version": "10.5" + "version": "10.5", + "sampleRepo": "https://github.com/sclorg/httpd-ex.git" }, "from": { "kind": "DockerImage", @@ -124,7 +93,8 @@ "description": "Provides a MariaDB 10.5 database on RHEL 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.", "iconClass": "icon-mariadb", "tags": "database,mariadb", - "version": "10.5" + "version": "10.5", + "sampleRepo": "https://github.com/sclorg/httpd-ex.git" }, "from": { "kind": "DockerImage", @@ -133,6 +103,25 @@ "referencePolicy": { "type": "Local" } + }, + { + "name": "latest", + "annotations": { + "openshift.io/display-name": "MariaDB 10.5 (Latest)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "description": "Provides a MariaDB 10.5 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.5/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-mariadb", + "tags": "database,mariadb", + "version": "10.5", + "sampleRepo": "https://github.com/sclorg/httpd-ex.git" + }, + "from": { + "kind": "ImageStreamTag", + "name": "10.5-el8" + }, + "referencePolicy": { + "type": "Local" + } } ] }