From b52d467ce10edfe51410a52393aeff8e079281e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arda=20G=C3=BC=C3=A7l=C3=BC?= Date: Mon, 16 Sep 2024 13:18:12 +0300 Subject: [PATCH] Revert "OCPBUGS-39373: Use a supported Perl version in the test template." --- test/extended/testdata/bindata.go | 29 +++++++++---------- .../cluster/quickstarts/dancer-mysql.json | 4 +-- test/extended/testdata/cmd/test/cmd/images.sh | 12 ++++---- .../image-streams/image-streams-centos7.json | 12 ++++---- 4 files changed, 28 insertions(+), 29 deletions(-) diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go index 230e77d1948c..6c538463e697 100644 --- a/test/extended/testdata/bindata.go +++ b/test/extended/testdata/bindata.go @@ -28725,7 +28725,7 @@ var _testExtendedTestdataClusterQuickstartsDancerMysqlJson = []byte(`{ "name": "PERL_VERSION", "displayName": "Version of Perl Image", "description": "Version of Perl image to be used (5.30-el7, 5.30-ubi8, or latest).", - "value": "5.32-ubi8", + "value": "5.30-ubi8", "required": true }, { @@ -28823,8 +28823,7 @@ var _testExtendedTestdataClusterQuickstartsDancerMysqlJson = []byte(`{ "app": "dancer-mysql-example", "template": "dancer-mysql-example" } -} -`) +}`) func testExtendedTestdataClusterQuickstartsDancerMysqlJsonBytes() ([]byte, error) { return _testExtendedTestdataClusterQuickstartsDancerMysqlJson, nil @@ -34156,12 +34155,12 @@ os::test::junit::declare_suite_end os::test::junit::declare_suite_start "cmd/images${IMAGES_TESTS_POSTFIX:-}/delete-istag" # test deleting a tag using oc delete -os::cmd::expect_success_and_text "oc get is perl --template '{{(index .spec.tags 0).name}}'" '5.32-' -os::cmd::expect_success_and_text "oc get is perl --template '{{(index .status.tags 0).tag}}'" '5.32-' -os::cmd::expect_success_and_text "oc describe is perl | sed -n -e '0,/^Tags:/d' -e '/^\s\+/d' -e '/./p' | head -n 1" '5.32-' -os::cmd::expect_success "oc delete istag/perl:5.32-el8 --context='${cluster_admin_context}'" -os::cmd::expect_success_and_not_text 'oc get is/perl --template={{.spec.tags}}' 'name:5.32-el8' -os::cmd::expect_success_and_not_text 'oc get is/perl --template={{.status.tags}}' 'tag:5.32-el8' +os::cmd::expect_success_and_text "oc get is perl --template '{{(index .spec.tags 0).name}}'" '5.30-' +os::cmd::expect_success_and_text "oc get is perl --template '{{(index .status.tags 0).tag}}'" '5.30-' +os::cmd::expect_success_and_text "oc describe is perl | sed -n -e '0,/^Tags:/d' -e '/^\s\+/d' -e '/./p' | head -n 1" '5.30-' +os::cmd::expect_success "oc delete istag/perl:5.30-el7 --context='${cluster_admin_context}'" +os::cmd::expect_success_and_not_text 'oc get is/perl --template={{.spec.tags}}' 'name:5.30-el7' +os::cmd::expect_success_and_not_text 'oc get is/perl --template={{.status.tags}}' 'tag:5.30-el7' os::cmd::expect_success 'oc delete all --all' echo "delete istag: ok" @@ -37186,20 +37185,20 @@ var _testExtendedTestdataCmdTestCmdTestdataImageStreamsImageStreamsCentos7Json = } }, { - "name": "5.32-el8", + "name": "5.30-el7", "annotations": { - "description": "Build and run Perl 5.32 applications on CentOS 8. 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 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.", "iconClass": "icon-perl", - "openshift.io/display-name": "Perl 5.32 (CentOS 8)", + "openshift.io/display-name": "Perl 5.30 (CentOS 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/dancer-ex.git", - "supports": "perl:5.32,perl", + "supports": "perl:5.30,perl", "tags": "builder,perl", - "version": "5.32" + "version": "5.30" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/perl-532:latest" + "name": "quay.io/centos7/perl-530-centos7:centos7" }, "generation": null, "importPolicy": {}, diff --git a/test/extended/testdata/cluster/quickstarts/dancer-mysql.json b/test/extended/testdata/cluster/quickstarts/dancer-mysql.json index 712e1c92f9db..3c5a3829f8b6 100644 --- a/test/extended/testdata/cluster/quickstarts/dancer-mysql.json +++ b/test/extended/testdata/cluster/quickstarts/dancer-mysql.json @@ -424,7 +424,7 @@ "name": "PERL_VERSION", "displayName": "Version of Perl Image", "description": "Version of Perl image to be used (5.30-el7, 5.30-ubi8, or latest).", - "value": "5.32-ubi8", + "value": "5.30-ubi8", "required": true }, { @@ -522,4 +522,4 @@ "app": "dancer-mysql-example", "template": "dancer-mysql-example" } -} +} \ No newline at end of file diff --git a/test/extended/testdata/cmd/test/cmd/images.sh b/test/extended/testdata/cmd/test/cmd/images.sh index b5f8486397a4..a6796517e03d 100755 --- a/test/extended/testdata/cmd/test/cmd/images.sh +++ b/test/extended/testdata/cmd/test/cmd/images.sh @@ -290,12 +290,12 @@ os::test::junit::declare_suite_end os::test::junit::declare_suite_start "cmd/images${IMAGES_TESTS_POSTFIX:-}/delete-istag" # test deleting a tag using oc delete -os::cmd::expect_success_and_text "oc get is perl --template '{{(index .spec.tags 0).name}}'" '5.32-' -os::cmd::expect_success_and_text "oc get is perl --template '{{(index .status.tags 0).tag}}'" '5.32-' -os::cmd::expect_success_and_text "oc describe is perl | sed -n -e '0,/^Tags:/d' -e '/^\s\+/d' -e '/./p' | head -n 1" '5.32-' -os::cmd::expect_success "oc delete istag/perl:5.32-el8 --context='${cluster_admin_context}'" -os::cmd::expect_success_and_not_text 'oc get is/perl --template={{.spec.tags}}' 'name:5.32-el8' -os::cmd::expect_success_and_not_text 'oc get is/perl --template={{.status.tags}}' 'tag:5.32-el8' +os::cmd::expect_success_and_text "oc get is perl --template '{{(index .spec.tags 0).name}}'" '5.30-' +os::cmd::expect_success_and_text "oc get is perl --template '{{(index .status.tags 0).tag}}'" '5.30-' +os::cmd::expect_success_and_text "oc describe is perl | sed -n -e '0,/^Tags:/d' -e '/^\s\+/d' -e '/./p' | head -n 1" '5.30-' +os::cmd::expect_success "oc delete istag/perl:5.30-el7 --context='${cluster_admin_context}'" +os::cmd::expect_success_and_not_text 'oc get is/perl --template={{.spec.tags}}' 'name:5.30-el7' +os::cmd::expect_success_and_not_text 'oc get is/perl --template={{.status.tags}}' 'tag:5.30-el7' os::cmd::expect_success 'oc delete all --all' echo "delete istag: ok" diff --git a/test/extended/testdata/cmd/test/cmd/testdata/image-streams/image-streams-centos7.json b/test/extended/testdata/cmd/test/cmd/testdata/image-streams/image-streams-centos7.json index 485cc6f279ef..2c3ea827fe69 100644 --- a/test/extended/testdata/cmd/test/cmd/testdata/image-streams/image-streams-centos7.json +++ b/test/extended/testdata/cmd/test/cmd/testdata/image-streams/image-streams-centos7.json @@ -502,20 +502,20 @@ } }, { - "name": "5.32-el8", + "name": "5.30-el7", "annotations": { - "description": "Build and run Perl 5.32 applications on CentOS 8. 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 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.", "iconClass": "icon-perl", - "openshift.io/display-name": "Perl 5.32 (CentOS 8)", + "openshift.io/display-name": "Perl 5.30 (CentOS 7)", "openshift.io/provider-display-name": "Red Hat, Inc.", "sampleRepo": "https://github.com/sclorg/dancer-ex.git", - "supports": "perl:5.32,perl", + "supports": "perl:5.30,perl", "tags": "builder,perl", - "version": "5.32" + "version": "5.30" }, "from": { "kind": "DockerImage", - "name": "registry.redhat.io/ubi8/perl-532:latest" + "name": "quay.io/centos7/perl-530-centos7:centos7" }, "generation": null, "importPolicy": {},