From 813f3d5091f501228d88777511be3259bd7c0442 Mon Sep 17 00:00:00 2001 From: Petr Hracek Date: Wed, 3 Apr 2024 19:23:02 +0200 Subject: [PATCH] remove Nginx-1.24 imagestream till GA (#294) Signed-off-by: Petr "Stone" Hracek --- imagestreams/imagestreams.yaml | 18 +++++------ imagestreams/nginx-centos.json | 46 +++------------------------- imagestreams/nginx-rhel-aarch64.json | 46 +++------------------------- imagestreams/nginx-rhel.json | 46 +++------------------------- test/test-lib-nginx.sh | 9 ++++++ 5 files changed, 30 insertions(+), 135 deletions(-) diff --git a/imagestreams/imagestreams.yaml b/imagestreams/imagestreams.yaml index fc526988..d57789f2 100644 --- a/imagestreams/imagestreams.yaml +++ b/imagestreams/imagestreams.yaml @@ -13,34 +13,34 @@ https://github.com/sclorg/nginx-container/blob/master/APP_VERSION/README.md. imagestream_files: - filename: nginx-centos.json - latest: "1.24-ubi8" + latest: "1.22-ubi8" distros: - name: UBI 7 app_versions: ["1.20"] - name: UBI 8 - app_versions: ["1.22", "1.24"] + app_versions: ["1.22"] - name: UBI 9 - app_versions: ["1.20", "1.22", "1.24"] + app_versions: ["1.20", "1.22"] - filename: nginx-rhel.json - latest: "1.24-ubi8" + latest: "1.22-ubi8" distros: - name: UBI 7 app_versions: ["1.20"] - name: UBI 8 - app_versions: ["1.22", "1.24"] + app_versions: ["1.22"] - name: UBI 9 - app_versions: ["1.20", "1.22", "1.24"] + app_versions: ["1.20", "1.22"] - filename: nginx-rhel-aarch64.json - latest: "1.24-ubi8" + latest: "1.22-ubi8" distros: - name: UBI 8 - app_versions: ["1.22", "1.24"] + app_versions: ["1.22"] - name: UBI 9 - app_versions: ["1.20", "1.22", "1.24"] + app_versions: ["1.20", "1.22"] diff --git a/imagestreams/nginx-centos.json b/imagestreams/nginx-centos.json index ab7dd6ab..7987f2ba 100644 --- a/imagestreams/nginx-centos.json +++ b/imagestreams/nginx-centos.json @@ -47,25 +47,6 @@ "type": "Local" } }, - { - "name": "1.24-ubi8", - "annotations": { - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.24 (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.24/README.md.", - "iconClass": "icon-nginx", - "tags": "builder,nginx", - "version": "1.24", - "sampleRepo": "https://github.com/sclorg/nginx-ex.git" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/nginx-124:latest" - }, - "referencePolicy": { - "type": "Local" - } - }, { "name": "1.20-ubi9", "annotations": { @@ -104,39 +85,20 @@ "type": "Local" } }, - { - "name": "1.24-ubi9", - "annotations": { - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.24 (UBI 9)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.24/README.md.", - "iconClass": "icon-nginx", - "tags": "builder,nginx", - "version": "1.24", - "sampleRepo": "https://github.com/sclorg/nginx-ex.git" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi9/nginx-124:latest" - }, - "referencePolicy": { - "type": "Local" - } - }, { "name": "latest", "annotations": { - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.24 (Latest)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.24/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", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/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-nginx", "tags": "builder,nginx", - "version": "1.24", + "version": "1.22", "sampleRepo": "https://github.com/sclorg/nginx-ex.git" }, "from": { "kind": "ImageStreamTag", - "name": "1.24-ubi8" + "name": "1.22-ubi8" }, "referencePolicy": { "type": "Local" diff --git a/imagestreams/nginx-rhel-aarch64.json b/imagestreams/nginx-rhel-aarch64.json index bece1a72..09fc30f8 100644 --- a/imagestreams/nginx-rhel-aarch64.json +++ b/imagestreams/nginx-rhel-aarch64.json @@ -28,25 +28,6 @@ "type": "Local" } }, - { - "name": "1.24-ubi8", - "annotations": { - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.24 (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.24/README.md.", - "iconClass": "icon-nginx", - "tags": "builder,nginx", - "version": "1.24", - "sampleRepo": "https://github.com/sclorg/nginx-ex.git" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nginx-124:latest" - }, - "referencePolicy": { - "type": "Local" - } - }, { "name": "1.20-ubi9", "annotations": { @@ -85,39 +66,20 @@ "type": "Local" } }, - { - "name": "1.24-ubi9", - "annotations": { - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.24 (UBI 9)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.24/README.md.", - "iconClass": "icon-nginx", - "tags": "builder,nginx", - "version": "1.24", - "sampleRepo": "https://github.com/sclorg/nginx-ex.git" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nginx-124:latest" - }, - "referencePolicy": { - "type": "Local" - } - }, { "name": "latest", "annotations": { - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.24 (Latest)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.24/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", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/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-nginx", "tags": "builder,nginx", - "version": "1.24", + "version": "1.22", "sampleRepo": "https://github.com/sclorg/nginx-ex.git" }, "from": { "kind": "ImageStreamTag", - "name": "1.24-ubi8" + "name": "1.22-ubi8" }, "referencePolicy": { "type": "Local" diff --git a/imagestreams/nginx-rhel.json b/imagestreams/nginx-rhel.json index e7c0a72c..ffc6b875 100644 --- a/imagestreams/nginx-rhel.json +++ b/imagestreams/nginx-rhel.json @@ -47,25 +47,6 @@ "type": "Local" } }, - { - "name": "1.24-ubi8", - "annotations": { - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.24 (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.24/README.md.", - "iconClass": "icon-nginx", - "tags": "builder,nginx", - "version": "1.24", - "sampleRepo": "https://github.com/sclorg/nginx-ex.git" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/nginx-124:latest" - }, - "referencePolicy": { - "type": "Local" - } - }, { "name": "1.20-ubi9", "annotations": { @@ -104,39 +85,20 @@ "type": "Local" } }, - { - "name": "1.24-ubi9", - "annotations": { - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.24 (UBI 9)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 9. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.24/README.md.", - "iconClass": "icon-nginx", - "tags": "builder,nginx", - "version": "1.24", - "sampleRepo": "https://github.com/sclorg/nginx-ex.git" - }, - "from": { - "kind": "DockerImage", - "name": "registry.redhat.io/ubi9/nginx-124:latest" - }, - "referencePolicy": { - "type": "Local" - } - }, { "name": "latest", "annotations": { - "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.24 (Latest)", + "openshift.io/display-name": "Nginx HTTP server and a reverse proxy 1.22 (Latest)", "openshift.io/provider-display-name": "Red Hat, Inc.", - "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.24/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", + "description": "Build and serve static content via Nginx HTTP Server and a reverse proxy (nginx) on UBI 8. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/nginx-container/blob/master/1.22/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-nginx", "tags": "builder,nginx", - "version": "1.24", + "version": "1.22", "sampleRepo": "https://github.com/sclorg/nginx-ex.git" }, "from": { "kind": "ImageStreamTag", - "name": "1.24-ubi8" + "name": "1.22-ubi8" }, "referencePolicy": { "type": "Local" diff --git a/test/test-lib-nginx.sh b/test/test-lib-nginx.sh index 1a816d8c..ded3d382 100644 --- a/test/test-lib-nginx.sh +++ b/test/test-lib-nginx.sh @@ -68,6 +68,15 @@ function test_latest_imagestreams() { echo "Do not check 'micro' imagestreams. Only main versions." return 0 fi + # Check if the current version is already GA + # This directory is cloned from TMT plan repo 'sclorg-tmt-plans' + local devel_file="/root/sclorg-tmt-plans/devel_images" + if [ -f "${devel_file}" ]; then + if grep -q "${OS}=nginx-container=${VERSION}" "$devel_file" ; then + echo "This version is currently developed, so skipping this test." + return + fi + fi # Switch to root directory of a container echo "Testing the latest version in imagestreams" pushd "${THISDIR}/../.." >/dev/null || return 1