diff --git a/cmd/openshift-tests/minimal.go b/cmd/openshift-tests/minimal.go index 0d1d8f3ccd77..8c88e2a8088c 100644 --- a/cmd/openshift-tests/minimal.go +++ b/cmd/openshift-tests/minimal.go @@ -333,9 +333,7 @@ var ( "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/php:7.3\" should be SCL enabled": {}, "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/php:7.2-ubi8\" should be SCL enabled": {}, "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/perl:5.30\" should be SCL enabled": {}, - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/perl:5.26\" should be SCL enabled": {}, "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:12\" should be SCL enabled": {}, - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled using the SCL in s2i images \"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:10\" should be SCL enabled": {}, "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:2.7\" should print the usage": {}, "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/ruby:2.6\" should print the usage": {}, "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/python:3.6-ubi8\" should print the usage": {}, @@ -343,9 +341,7 @@ var ( "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/php:7.3\" should print the usage": {}, "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/php:7.2-ubi8\" should print the usage": {}, "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/perl:5.30\" should print the usage": {}, - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/perl:5.26\" should print the usage": {}, "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:12\" should print the usage": {}, - "[sig-devex][Feature:ImageEcosystem][Slow] openshift images should be SCL enabled returning s2i usage when running the image \"image-registry.openshift-image-registry.svc:5000/openshift/nodejs:10\" should print the usage": {}, "[sig-cluster-lifecycle][Feature:Machines] Managed cluster should have machine resources [Suite:openshift/conformance/parallel]": {}, "[sig-cli] oc observe works as expected [Suite:openshift/conformance/parallel]": {}, "[sig-cli] oc debug does not require a real resource on the server [Suite:openshift/conformance/parallel]": {}, diff --git a/examples/image-streams/image-streams-centos7.json b/examples/image-streams/image-streams-centos7.json index bcbefa84a813..8953b5291c31 100644 --- a/examples/image-streams/image-streams-centos7.json +++ b/examples/image-streams/image-streams-centos7.json @@ -610,28 +610,6 @@ "referencePolicy": { "type": "Local" } - }, - { - "name": "5.26-ubi8", - "annotations": { - "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", - "openshift.io/display-name": "Perl 5.26 (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/dancer-ex.git", - "supports": "perl:5.26,perl", - "tags": "builder,perl", - "version": "5.26" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/perl-526:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } } ] } diff --git a/examples/quickstarts/dancer-mysql-persistent.json b/examples/quickstarts/dancer-mysql-persistent.json index 1ae8604c6399..b1cd178c2ce1 100644 --- a/examples/quickstarts/dancer-mysql-persistent.json +++ b/examples/quickstarts/dancer-mysql-persistent.json @@ -118,7 +118,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "perl:5.26-ubi8", + "name": "perl:5.30-ubi8", "namespace": "${NAMESPACE}" } }, diff --git a/examples/quickstarts/dancer-mysql.json b/examples/quickstarts/dancer-mysql.json index 9045c8e69d1c..ff9db5658ee5 100644 --- a/examples/quickstarts/dancer-mysql.json +++ b/examples/quickstarts/dancer-mysql.json @@ -118,7 +118,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "perl:5.26-ubi8", + "name": "perl:5.30-ubi8", "namespace": "${NAMESPACE}" } }, diff --git a/examples/quickstarts/rails-postgresql-persistent.json b/examples/quickstarts/rails-postgresql-persistent.json index 8726f0929ce7..3b8bc9d451bb 100644 --- a/examples/quickstarts/rails-postgresql-persistent.json +++ b/examples/quickstarts/rails-postgresql-persistent.json @@ -461,7 +461,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "postgresql:10", + "name": "postgresql:12", "namespace": "${NAMESPACE}" } }, diff --git a/examples/quickstarts/rails-postgresql.json b/examples/quickstarts/rails-postgresql.json index 2bbfe1cce3d1..aaef36427028 100644 --- a/examples/quickstarts/rails-postgresql.json +++ b/examples/quickstarts/rails-postgresql.json @@ -120,7 +120,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:2.5", + "name": "ruby:2.7", "namespace": "${NAMESPACE}" } }, @@ -442,7 +442,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "postgresql:10", + "name": "postgresql:12", "namespace": "${NAMESPACE}" } }, diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go index b64a29948646..b6f01a184696 100644 --- a/test/extended/testdata/bindata.go +++ b/test/extended/testdata/bindata.go @@ -4001,28 +4001,6 @@ var _examplesImageStreamsImageStreamsCentos7Json = []byte(`{ "referencePolicy": { "type": "Local" } - }, - { - "name": "5.26-ubi8", - "annotations": { - "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", - "openshift.io/display-name": "Perl 5.26 (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/dancer-ex.git", - "supports": "perl:5.26,perl", - "tags": "builder,perl", - "version": "5.26" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/perl-526:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } } ] } @@ -7365,7 +7343,7 @@ var _examplesQuickstartsDancerMysqlPersistentJson = []byte(`{ ], "from": { "kind": "ImageStreamTag", - "name": "perl:5.26-ubi8", + "name": "perl:5.30-ubi8", "namespace": "${NAMESPACE}" } }, @@ -7918,7 +7896,7 @@ var _examplesQuickstartsDancerMysqlJson = []byte(`{ ], "from": { "kind": "ImageStreamTag", - "name": "perl:5.26-ubi8", + "name": "perl:5.30-ubi8", "namespace": "${NAMESPACE}" } }, @@ -12574,7 +12552,7 @@ var _examplesQuickstartsRailsPostgresqlPersistentJson = []byte(`{ ], "from": { "kind": "ImageStreamTag", - "name": "postgresql:10", + "name": "postgresql:12", "namespace": "${NAMESPACE}" } }, @@ -12862,7 +12840,7 @@ var _examplesQuickstartsRailsPostgresqlJson = []byte(`{ ], "from": { "kind": "ImageStreamTag", - "name": "ruby:2.5", + "name": "ruby:2.7", "namespace": "${NAMESPACE}" } }, @@ -13184,7 +13162,7 @@ var _examplesQuickstartsRailsPostgresqlJson = []byte(`{ ], "from": { "kind": "ImageStreamTag", - "name": "postgresql:10", + "name": "postgresql:12", "namespace": "${NAMESPACE}" } }, @@ -18690,7 +18668,7 @@ spec: sourceStrategy: from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/nodejs:10 + name: image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest `) func testExtendedTestdataBuildsPullsecretLinkedNodejsBcYamlBytes() ([]byte, error) { @@ -23906,7 +23884,7 @@ var _testExtendedTestdataClusterQuickstartsDancerMysqlJson = []byte(`{ ], "from": { "kind": "ImageStreamTag", - "name": "perl:5.26-ubi8", + "name": "perl:5.30-ubi8", "namespace": "${NAMESPACE}" } }, @@ -25883,7 +25861,7 @@ var _testExtendedTestdataClusterQuickstartsRailsPostgresqlJson = []byte(`{ ], "from": { "kind": "ImageStreamTag", - "name": "postgresql:10", + "name": "postgresql:12", "namespace": "${NAMESPACE}" } }, @@ -30426,8 +30404,8 @@ 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.26-ubi8' -os::cmd::expect_success_and_text "oc get is perl --template '{{(index .status.tags 0).tag}}'" '5.26-ubi8' +os::cmd::expect_success_and_text "oc get is perl --template '{{(index .spec.tags 0).name}}'" '5.30-ubi8' +os::cmd::expect_success_and_text "oc get is perl --template '{{(index .status.tags 0).tag}}'" '5.30-ubi8' 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-ubi8 \(latest\)' os::cmd::expect_success "oc delete istag/perl:5.30-ubi8 --context='${cluster_admin_context}'" os::cmd::expect_success_and_not_text 'oc get is/perl --template={{.spec.tags}}' 'version:5.30-ubi8' @@ -31064,11 +31042,9 @@ os::cmd::try_until_success 'oc get imagestreamtags nginx:latest' os::cmd::try_until_success 'oc get imagestreamtags nginx:1.14' os::cmd::try_until_success 'oc get imagestreamtags nginx:1.16' os::cmd::try_until_success 'oc get imagestreamtags nodejs:latest' -os::cmd::try_until_success 'oc get imagestreamtags nodejs:10' os::cmd::try_until_success 'oc get imagestreamtags nodejs:12' os::cmd::try_until_success 'oc get imagestreamtags perl:latest' os::cmd::try_until_success 'oc get imagestreamtags perl:5.30' -os::cmd::try_until_success 'oc get imagestreamtags perl:5.26-ubi8' os::cmd::try_until_success 'oc get imagestreamtags php:latest' os::cmd::try_until_success 'oc get imagestreamtags php:7.0' os::cmd::try_until_success 'oc get imagestreamtags php:7.1' @@ -35297,28 +35273,6 @@ var _testExtendedTestdataCmdTestCmdTestdataImageStreamsImageStreamsCentos7Json = "referencePolicy": { "type": "Local" } - }, - { - "name": "5.26-ubi8", - "annotations": { - "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", - "openshift.io/display-name": "Perl 5.26 (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/dancer-ex.git", - "supports": "perl:5.26,perl", - "tags": "builder,perl", - "version": "5.26" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/perl-526:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } } ] } diff --git a/test/extended/testdata/builds/pullsecret/linked-nodejs-bc.yaml b/test/extended/testdata/builds/pullsecret/linked-nodejs-bc.yaml index 9fb1d08331f5..aa6dccfd3d33 100644 --- a/test/extended/testdata/builds/pullsecret/linked-nodejs-bc.yaml +++ b/test/extended/testdata/builds/pullsecret/linked-nodejs-bc.yaml @@ -11,4 +11,4 @@ spec: sourceStrategy: from: kind: DockerImage - name: image-registry.openshift-image-registry.svc:5000/openshift/nodejs:10 + name: image-registry.openshift-image-registry.svc:5000/openshift/nodejs:latest diff --git a/test/extended/testdata/cluster/quickstarts/dancer-mysql.json b/test/extended/testdata/cluster/quickstarts/dancer-mysql.json index e5b49c8deb06..bf4e7a6f0bf9 100644 --- a/test/extended/testdata/cluster/quickstarts/dancer-mysql.json +++ b/test/extended/testdata/cluster/quickstarts/dancer-mysql.json @@ -118,7 +118,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "perl:5.26-ubi8", + "name": "perl:5.30-ubi8", "namespace": "${NAMESPACE}" } }, diff --git a/test/extended/testdata/cluster/quickstarts/rails-postgresql.json b/test/extended/testdata/cluster/quickstarts/rails-postgresql.json index 6763e2517b05..472d4b43cb9e 100644 --- a/test/extended/testdata/cluster/quickstarts/rails-postgresql.json +++ b/test/extended/testdata/cluster/quickstarts/rails-postgresql.json @@ -442,7 +442,7 @@ ], "from": { "kind": "ImageStreamTag", - "name": "postgresql:10", + "name": "postgresql:12", "namespace": "${NAMESPACE}" } }, diff --git a/test/extended/testdata/cmd/test/cmd/images.sh b/test/extended/testdata/cmd/test/cmd/images.sh index 672247056aa8..b93221ec61ea 100755 --- a/test/extended/testdata/cmd/test/cmd/images.sh +++ b/test/extended/testdata/cmd/test/cmd/images.sh @@ -291,8 +291,8 @@ 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.26-ubi8' -os::cmd::expect_success_and_text "oc get is perl --template '{{(index .status.tags 0).tag}}'" '5.26-ubi8' +os::cmd::expect_success_and_text "oc get is perl --template '{{(index .spec.tags 0).name}}'" '5.30-ubi8' +os::cmd::expect_success_and_text "oc get is perl --template '{{(index .status.tags 0).tag}}'" '5.30-ubi8' 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-ubi8 \(latest\)' os::cmd::expect_success "oc delete istag/perl:5.30-ubi8 --context='${cluster_admin_context}'" os::cmd::expect_success_and_not_text 'oc get is/perl --template={{.spec.tags}}' 'version:5.30-ubi8' diff --git a/test/extended/testdata/cmd/test/cmd/newapp.sh b/test/extended/testdata/cmd/test/cmd/newapp.sh index 145b670a20a1..b700a30f0e49 100755 --- a/test/extended/testdata/cmd/test/cmd/newapp.sh +++ b/test/extended/testdata/cmd/test/cmd/newapp.sh @@ -342,11 +342,9 @@ os::cmd::try_until_success 'oc get imagestreamtags nginx:latest' os::cmd::try_until_success 'oc get imagestreamtags nginx:1.14' os::cmd::try_until_success 'oc get imagestreamtags nginx:1.16' os::cmd::try_until_success 'oc get imagestreamtags nodejs:latest' -os::cmd::try_until_success 'oc get imagestreamtags nodejs:10' os::cmd::try_until_success 'oc get imagestreamtags nodejs:12' os::cmd::try_until_success 'oc get imagestreamtags perl:latest' os::cmd::try_until_success 'oc get imagestreamtags perl:5.30' -os::cmd::try_until_success 'oc get imagestreamtags perl:5.26-ubi8' os::cmd::try_until_success 'oc get imagestreamtags php:latest' os::cmd::try_until_success 'oc get imagestreamtags php:7.0' os::cmd::try_until_success 'oc get imagestreamtags php:7.1' 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 43aff6249c57..88c713731cba 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 @@ -610,28 +610,6 @@ "referencePolicy": { "type": "Local" } - }, - { - "name": "5.26-ubi8", - "annotations": { - "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", - "openshift.io/display-name": "Perl 5.26 (UBI 8)", - "openshift.io/provider-display-name": "Red Hat, Inc.", - "sampleRepo": "https://github.com/sclorg/dancer-ex.git", - "supports": "perl:5.26,perl", - "tags": "builder,perl", - "version": "5.26" - }, - "from": { - "kind": "DockerImage", - "name": "registry.access.redhat.com/ubi8/perl-526:latest" - }, - "generation": null, - "importPolicy": {}, - "referencePolicy": { - "type": "Local" - } } ] }