From 9b86eb23ad9b515543ffbe0320ae0faa8cb89f36 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Tue, 18 Jun 2024 14:32:02 +0200 Subject: [PATCH 1/4] Add imagestream.yaml generator Signed-off-by: Petr "Stone" Hracek --- imagestreams/imagestreams.yaml | 57 ++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 imagestreams/imagestreams.yaml diff --git a/imagestreams/imagestreams.yaml b/imagestreams/imagestreams.yaml new file mode 100644 index 0000000..6e0f3b7 --- /dev/null +++ b/imagestreams/imagestreams.yaml @@ -0,0 +1,57 @@ +--- +- name: perl + pretty_name: Perl + sample_repo: "https://github.com/sclorg/dancer-ex.git" + category: builder + description: >- + Build and run Perl APP_VERSION applications on DISTRO_NAME. For more information + about using this builder image, including OpenShift considerations, see + https://github.com/sclorg/s2i-perl-container/blob/master/APP_VERSION/README.md. + imagestream_files: + - filename: perl-centos.json + latest: "5.32-ubi8" + distros: + - name: UBI 7 + app_versions: ["5.30"] + + - name: UBI 8 + app_versions: ["5.26", "5.32"] + + - name: UBI 9 + app_versions: ["5.32"] + custom_tags: + - name: "5.30" + distro: UBI 7 + app_version: ["5.30"] + + - filename: perl-rhel.json + latest: "5.32-ubi8" + distros: + - name: UBI 7 + app_versions: ["5.30"] + + - name: UBI 8 + app_versions: ["5.26", "5.32"] + + - name: UBI 9 + app_versions: ["5.32"] + custom_tags: + - name: "5.30" + distro: UBI 7 + app_version: ["5.30"] + + - filename: perl-rhel-aarch64.json + latest: "5.32-ubi8" + distros: + - name: UBI 7 + app_versions: ["5.30"] + + - name: UBI 8 + app_versions: ["5.26", "5.32"] + + - name: UBI 9 + app_versions: ["5.32"] + custom_tags: + - name: "5.30" + distro: UBI 7 + app_version: ["5.30"] From 6040bbf34fa1a2ba218dd532551187dff69fe755 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Tue, 18 Jun 2024 14:32:27 +0200 Subject: [PATCH 2/4] Add generated files Signed-off-by: Petr "Stone" Hracek --- imagestreams/perl-centos.json | 65 +++++++++++------------- imagestreams/perl-rhel-aarch64.json | 79 +++++++++++++++++++++-------- imagestreams/perl-rhel.json | 69 ++++++++++++------------- 3 files changed, 119 insertions(+), 94 deletions(-) diff --git a/imagestreams/perl-centos.json b/imagestreams/perl-centos.json index 24b767b..b176a22 100644 --- a/imagestreams/perl-centos.json +++ b/imagestreams/perl-centos.json @@ -10,39 +10,38 @@ "spec": { "tags": [ { - "name": "latest", + "name": "5.30-ubi7", "annotations": { - "openshift.io/display-name": "Perl (Latest)", + "openshift.io/display-name": "Perl 5.30 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and run Perl applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Perl available on OpenShift, including major version updates.", + "description": "Build and run Perl 5.30 applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.30/README.md.", "iconClass": "icon-perl", "tags": "builder,perl", - "supports":"perl", + "version": "5.30", "sampleRepo": "https://github.com/sclorg/dancer-ex.git" }, "from": { - "kind": "ImageStreamTag", - "name": "5.32-ubi8" + "kind": "DockerImage", + "name": "registry.access.redhat.com/ubi7/perl-530:latest" }, "referencePolicy": { "type": "Local" } }, { - "name": "5.32-ubi9", + "name": "5.26-ubi8", "annotations": { - "openshift.io/display-name": "Perl 5.32 (UBI 9)", + "openshift.io/display-name": "Perl 5.26 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and run Perl 5.32 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.", - "iconClass": "icon-perl", + "description": "Build and run Perl 5.26 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.26/README.md.", + "iconClass": "icon-perl", "tags": "builder,perl", - "supports":"perl:5.32,perl", - "version": "5.32", + "version": "5.26", "sampleRepo": "https://github.com/sclorg/dancer-ex.git" }, "from": { "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi9/perl-532:latest" + "name": "registry.access.redhat.com/ubi8/perl-526:latest" }, "referencePolicy": { "type": "Local" @@ -54,9 +53,8 @@ "openshift.io/display-name": "Perl 5.32 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "Build and run Perl 5.32 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.", - "iconClass": "icon-perl", + "iconClass": "icon-perl", "tags": "builder,perl", - "supports":"perl:5.32,perl", "version": "5.32", "sampleRepo": "https://github.com/sclorg/dancer-ex.git" }, @@ -69,20 +67,19 @@ } }, { - "name": "5.30-el7", + "name": "5.32-ubi9", "annotations": { - "openshift.io/display-name": "Perl 5.30 (CentOS 7)", + "openshift.io/display-name": "Perl 5.32 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and run Perl 5.30 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.30/README.md.", + "description": "Build and run Perl 5.32 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.", "iconClass": "icon-perl", "tags": "builder,perl", - "supports":"perl:5.30,perl", - "version": "5.30", + "version": "5.32", "sampleRepo": "https://github.com/sclorg/dancer-ex.git" }, "from": { "kind": "DockerImage", - "name": "quay.io/centos7/perl-530-centos7:latest" + "name": "registry.access.redhat.com/ubi9/perl-532:latest" }, "referencePolicy": { "type": "Local" @@ -91,38 +88,36 @@ { "name": "5.30", "annotations": { - "openshift.io/display-name": "Perl 5.30", + "openshift.io/display-name": "Perl ['5.30'] (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and run Perl 5.30 applications on CentOS 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.30/README.md.", + "description": "Build and run Perl ['5.30'] applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/['5.30']/README.md.", "iconClass": "icon-perl", - "tags": "builder,perl,hidden", - "supports":"perl:5.30,perl", - "version": "5.30", + "tags": "builder,perl", + "version": "['5.30']", "sampleRepo": "https://github.com/sclorg/dancer-ex.git" }, "from": { "kind": "DockerImage", - "name": "quay.io/centos7/perl-530-centos7:latest" + "name": "registry.access.redhat.com/ubi7/perl-['530']:latest" }, "referencePolicy": { "type": "Local" } }, { - "name": "5.26-ubi8", + "name": "latest", "annotations": { - "openshift.io/display-name": "Perl 5.26 (UBI 8)", + "openshift.io/display-name": "Perl 5.32 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and run Perl 5.26 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.26-mod_fcgid/README.md.", - "iconClass": "icon-perl", + "description": "Build and run Perl 5.32 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/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-perl", "tags": "builder,perl", - "supports":"perl:5.26,perl", - "version": "5.26", + "version": "5.32", "sampleRepo": "https://github.com/sclorg/dancer-ex.git" }, "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/perl-526:latest" + "kind": "ImageStreamTag", + "name": "5.32-ubi8" }, "referencePolicy": { "type": "Local" diff --git a/imagestreams/perl-rhel-aarch64.json b/imagestreams/perl-rhel-aarch64.json index 44544d6..df7e2fc 100644 --- a/imagestreams/perl-rhel-aarch64.json +++ b/imagestreams/perl-rhel-aarch64.json @@ -10,39 +10,38 @@ "spec": { "tags": [ { - "name": "latest", + "name": "5.30-ubi7", "annotations": { - "openshift.io/display-name": "Perl (Latest)", + "openshift.io/display-name": "Perl 5.30 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and run Perl applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Perl available on OpenShift, including major version updates.", + "description": "Build and run Perl 5.30 applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.30/README.md.", "iconClass": "icon-perl", "tags": "builder,perl", - "supports":"perl", + "version": "5.30", "sampleRepo": "https://github.com/sclorg/dancer-ex.git" }, "from": { - "kind": "ImageStreamTag", - "name": "5.32-ubi8" + "kind": "DockerImage", + "name": "registry.redhat.io/ubi7/perl-530:latest" }, "referencePolicy": { "type": "Local" } }, { - "name": "5.32-ubi9", + "name": "5.26-ubi8", "annotations": { - "openshift.io/display-name": "Perl 5.32 (UBI 9)", + "openshift.io/display-name": "Perl 5.26 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and run Perl 5.32 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.", - "iconClass": "icon-perl", + "description": "Build and run Perl 5.26 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.26/README.md.", + "iconClass": "icon-perl", "tags": "builder,perl", - "supports":"perl:5.32,perl", - "version": "5.32", + "version": "5.26", "sampleRepo": "https://github.com/sclorg/dancer-ex.git" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/perl-532:latest" + "name": "registry.redhat.io/ubi8/perl-526:latest" }, "referencePolicy": { "type": "Local" @@ -54,9 +53,8 @@ "openshift.io/display-name": "Perl 5.32 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "Build and run Perl 5.32 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.", - "iconClass": "icon-perl", + "iconClass": "icon-perl", "tags": "builder,perl", - "supports":"perl:5.32,perl", "version": "5.32", "sampleRepo": "https://github.com/sclorg/dancer-ex.git" }, @@ -69,20 +67,57 @@ } }, { - "name": "5.26-ubi8", + "name": "5.32-ubi9", "annotations": { - "openshift.io/display-name": "Perl 5.26 (UBI 8)", + "openshift.io/display-name": "Perl 5.32 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and run Perl 5.26 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.26-mod_fcgid/README.md.", - "iconClass": "icon-perl", + "description": "Build and run Perl 5.32 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.", + "iconClass": "icon-perl", "tags": "builder,perl", - "supports":"perl:5.26,perl", - "version": "5.26", + "version": "5.32", "sampleRepo": "https://github.com/sclorg/dancer-ex.git" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/perl-526:latest" + "name": "registry.redhat.io/ubi9/perl-532:latest" + }, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "5.30", + "annotations": { + "openshift.io/display-name": "Perl ['5.30'] (UBI 7)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "description": "Build and run Perl ['5.30'] applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/['5.30']/README.md.", + "iconClass": "icon-perl", + "tags": "builder,perl", + "version": "['5.30']", + "sampleRepo": "https://github.com/sclorg/dancer-ex.git" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/ubi7/perl-['530']:latest" + }, + "referencePolicy": { + "type": "Local" + } + }, + { + "name": "latest", + "annotations": { + "openshift.io/display-name": "Perl 5.32 (Latest)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "description": "Build and run Perl 5.32 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/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-perl", + "tags": "builder,perl", + "version": "5.32", + "sampleRepo": "https://github.com/sclorg/dancer-ex.git" + }, + "from": { + "kind": "ImageStreamTag", + "name": "5.32-ubi8" }, "referencePolicy": { "type": "Local" diff --git a/imagestreams/perl-rhel.json b/imagestreams/perl-rhel.json index 434a576..df7e2fc 100644 --- a/imagestreams/perl-rhel.json +++ b/imagestreams/perl-rhel.json @@ -10,39 +10,38 @@ "spec": { "tags": [ { - "name": "latest", + "name": "5.30-ubi7", "annotations": { - "openshift.io/display-name": "Perl (Latest)", + "openshift.io/display-name": "Perl 5.30 (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and run Perl applications on UBI. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version of Perl available on OpenShift, including major version updates.", + "description": "Build and run Perl 5.30 applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.30/README.md.", "iconClass": "icon-perl", "tags": "builder,perl", - "supports":"perl", + "version": "5.30", "sampleRepo": "https://github.com/sclorg/dancer-ex.git" }, "from": { - "kind": "ImageStreamTag", - "name": "5.32-ubi8" + "kind": "DockerImage", + "name": "registry.redhat.io/ubi7/perl-530:latest" }, "referencePolicy": { "type": "Local" } }, { - "name": "5.32-ubi9", + "name": "5.26-ubi8", "annotations": { - "openshift.io/display-name": "Perl 5.32 (UBI 9)", + "openshift.io/display-name": "Perl 5.26 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and run Perl 5.32 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.", - "iconClass": "icon-perl", + "description": "Build and run Perl 5.26 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.26/README.md.", + "iconClass": "icon-perl", "tags": "builder,perl", - "supports":"perl:5.32,perl", - "version": "5.32", + "version": "5.26", "sampleRepo": "https://github.com/sclorg/dancer-ex.git" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/perl-532:latest" + "name": "registry.redhat.io/ubi8/perl-526:latest" }, "referencePolicy": { "type": "Local" @@ -54,9 +53,8 @@ "openshift.io/display-name": "Perl 5.32 (UBI 8)", "openshift.io/provider-display-name": "Red Hat, Inc.", "description": "Build and run Perl 5.32 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.", - "iconClass": "icon-perl", + "iconClass": "icon-perl", "tags": "builder,perl", - "supports":"perl:5.32,perl", "version": "5.32", "sampleRepo": "https://github.com/sclorg/dancer-ex.git" }, @@ -69,20 +67,19 @@ } }, { - "name": "5.30-el7", + "name": "5.32-ubi9", "annotations": { - "openshift.io/display-name": "Perl 5.30 (RHEL 7)", + "openshift.io/display-name": "Perl 5.32 (UBI 9)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and run Perl 5.30 applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.30/README.md.", - "iconClass": "icon-perl", + "description": "Build and run Perl 5.32 applications on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/README.md.", + "iconClass": "icon-perl", "tags": "builder,perl", - "supports":"perl:5.30,perl", - "version": "5.30", + "version": "5.32", "sampleRepo": "https://github.com/sclorg/dancer-ex.git" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/perl-530-rhel7:latest" + "name": "registry.redhat.io/ubi9/perl-532:latest" }, "referencePolicy": { "type": "Local" @@ -91,38 +88,36 @@ { "name": "5.30", "annotations": { - "openshift.io/display-name": "Perl 5.30", + "openshift.io/display-name": "Perl ['5.30'] (UBI 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and run Perl 5.30 applications on RHEL 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.30/README.md.", - "iconClass": "icon-perl", - "tags": "builder,perl,hidden", - "supports":"perl:5.30,perl", - "version": "5.30", + "description": "Build and run Perl ['5.30'] applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/['5.30']/README.md.", + "iconClass": "icon-perl", + "tags": "builder,perl", + "version": "['5.30']", "sampleRepo": "https://github.com/sclorg/dancer-ex.git" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/rhscl/perl-530-rhel7:latest" + "name": "registry.redhat.io/ubi7/perl-['530']:latest" }, "referencePolicy": { "type": "Local" } }, { - "name": "5.26-ubi8", + "name": "latest", "annotations": { - "openshift.io/display-name": "Perl 5.26 (UBI 8)", + "openshift.io/display-name": "Perl 5.32 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and run Perl 5.26 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.26-mod_fcgid/README.md.", - "iconClass": "icon-perl", + "description": "Build and run Perl 5.32 applications on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.32/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-perl", "tags": "builder,perl", - "supports":"perl:5.26,perl", - "version": "5.26", + "version": "5.32", "sampleRepo": "https://github.com/sclorg/dancer-ex.git" }, "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/perl-526:latest" + "kind": "ImageStreamTag", + "name": "5.32-ubi8" }, "referencePolicy": { "type": "Local" From d5eb045a344756cd7295db24f2013482c3f47b78 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Tue, 18 Jun 2024 14:33:04 +0200 Subject: [PATCH 3/4] Add support for checking imagestreams before running tests on OpenSHift 4 Signed-off-by: Petr "Stone" Hracek --- .github/workflows/openshift-tests.yml | 22 ++++++++++++++++------ imagestreams/imagestreams.yaml | 1 + 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.github/workflows/openshift-tests.yml b/.github/workflows/openshift-tests.yml index cc15952..593b503 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: diff --git a/imagestreams/imagestreams.yaml b/imagestreams/imagestreams.yaml index 6e0f3b7..6c46049 100644 --- a/imagestreams/imagestreams.yaml +++ b/imagestreams/imagestreams.yaml @@ -55,3 +55,4 @@ - name: "5.30" distro: UBI 7 app_version: ["5.30"] +... From ca54731c9b74deedab729f43adb15e5381c12433 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Tue, 18 Jun 2024 21:07:40 +0200 Subject: [PATCH 4/4] Remove UBI7 from arches Signed-off-by: Petr "Stone" Hracek --- imagestreams/imagestreams.yaml | 7 ------ imagestreams/perl-rhel-aarch64.json | 38 ----------------------------- 2 files changed, 45 deletions(-) diff --git a/imagestreams/imagestreams.yaml b/imagestreams/imagestreams.yaml index 6c46049..9a8374e 100644 --- a/imagestreams/imagestreams.yaml +++ b/imagestreams/imagestreams.yaml @@ -43,16 +43,9 @@ - filename: perl-rhel-aarch64.json latest: "5.32-ubi8" distros: - - name: UBI 7 - app_versions: ["5.30"] - - name: UBI 8 app_versions: ["5.26", "5.32"] - name: UBI 9 app_versions: ["5.32"] - custom_tags: - - name: "5.30" - distro: UBI 7 - app_version: ["5.30"] ... diff --git a/imagestreams/perl-rhel-aarch64.json b/imagestreams/perl-rhel-aarch64.json index df7e2fc..c4eb636 100644 --- a/imagestreams/perl-rhel-aarch64.json +++ b/imagestreams/perl-rhel-aarch64.json @@ -9,25 +9,6 @@ }, "spec": { "tags": [ - { - "name": "5.30-ubi7", - "annotations": { - "openshift.io/display-name": "Perl 5.30 (UBI 7)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and run Perl 5.30 applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/5.30/README.md.", - "iconClass": "icon-perl", - "tags": "builder,perl", - "version": "5.30", - "sampleRepo": "https://github.com/sclorg/dancer-ex.git" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi7/perl-530:latest" - }, - "referencePolicy": { - "type": "Local" - } - }, { "name": "5.26-ubi8", "annotations": { @@ -85,25 +66,6 @@ "type": "Local" } }, - { - "name": "5.30", - "annotations": { - "openshift.io/display-name": "Perl ['5.30'] (UBI 7)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and run Perl ['5.30'] applications on UBI 7. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-perl-container/blob/master/['5.30']/README.md.", - "iconClass": "icon-perl", - "tags": "builder,perl", - "version": "['5.30']", - "sampleRepo": "https://github.com/sclorg/dancer-ex.git" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi7/perl-['530']:latest" - }, - "referencePolicy": { - "type": "Local" - } - }, { "name": "latest", "annotations": {