From 9049131cbd40d68b7a03ea289c2a2bd35623b7cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arda=20G=C3=BC=C3=A7l=C3=BC?= Date: Fri, 19 Apr 2024 13:33:14 +0300 Subject: [PATCH] Drop mariadb:10.3 usage --- test/extended/testdata/bindata.go | 17 ++++++++--------- test/extended/testdata/cmd/test/cmd/images.sh | 17 ++++++++--------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go index 07750b150337..2caa331072ca 100644 --- a/test/extended/testdata/bindata.go +++ b/test/extended/testdata/bindata.go @@ -33282,7 +33282,6 @@ os::cmd::expect_failure 'oc get imageStreams nodejs' os::cmd::expect_failure 'oc get imageStreams postgresql' os::cmd::expect_failure 'oc get imageStreams mongodb' os::cmd::expect_failure 'oc get imageStreams wildfly' -os::cmd::try_until_success 'oc get imagestreamTags mariadb:10.3' os::cmd::try_until_success 'oc get imagestreamTags mariadb:10.5' os::cmd::expect_success_and_text "oc get imagestreams mysql --template='{{ index .metadata.annotations \"openshift.io/image.dockerRepositoryCheck\"}}'" '[0-9]{4}\-[0-9]{2}\-[0-9]{2}' # expect a date like YYYY-MM-DD os::cmd::expect_success 'oc describe istag/mysql:latest' @@ -33308,7 +33307,7 @@ echo "imageStreams: ok" os::test::junit::declare_suite_end os::test::junit::declare_suite_start "cmd/images${IMAGES_TESTS_POSTFIX:-}/import-image" -# should follow the latest reference to 10.3 and update that, and leave latest unchanged +# should follow the latest reference to 10.5 and update that, and leave latest unchanged os::cmd::expect_success_and_text "oc get is/mariadb --template='{{(index .spec.tags 1).from.kind}}'" 'DockerImage' os::cmd::expect_success_and_text "oc get is/mariadb --template='{{(index .spec.tags 2).from.kind}}'" 'ImageStreamTag' os::cmd::expect_success_and_text "oc get is/mariadb --template='{{(index .spec.tags 2).from.name}}'" '10.5' @@ -33321,7 +33320,7 @@ os::cmd::expect_success_and_text "oc get is/mariadb --template='{{(index .spec.t os::cmd::expect_failure_and_text 'oc import-image mariadb --from=quay.io/openshifttest/hello-openshift:openshift' "use the 'tag' command if you want to change the source" os::cmd::expect_success 'oc describe is/mariadb' # import existing tag (explicit) -os::cmd::expect_success_and_text 'oc import-image mariadb:10.3' "sha256:" +os::cmd::expect_success_and_text 'oc import-image mariadb:10.5' "sha256:" os::cmd::expect_success_and_text 'oc import-image mariadb:latest' "sha256:" # import existing image stream creating new tag os::cmd::expect_success_and_text 'oc import-image mariadb:external --from=quay.io/openshifttest/hello-openshift:openshift' "sha256:" @@ -33383,23 +33382,23 @@ os::cmd::expect_success_and_text "oc get istag/mariadb:labeled -o jsonpath='{.me # test copying tags os::cmd::expect_success 'oc tag quay.io/openshift/origin-cli:4.6 newrepo:latest' os::cmd::expect_success_and_text "oc get is/newrepo --template='{{(index .spec.tags 0).from.kind}}'" 'DockerImage' -os::cmd::try_until_success 'oc get istag/mariadb:10.3' +os::cmd::try_until_success 'oc get istag/mariadb:10.5' # default behavior is to copy the current image, but since this is an external image we preserve the dockerImageReference -os::cmd::expect_success 'oc tag mariadb:10.3 newrepo:latest' +os::cmd::expect_success 'oc tag mariadb:10.5 newrepo:latest' os::cmd::expect_success_and_text "oc get is/newrepo --template='{{(index .spec.tags 0).from.kind}}'" 'ImageStreamImage' -os::cmd::expect_success_and_text "oc get is/newrepo --template='{{(index .status.tags 0 \"items\" 0).dockerImageReference}}'" '^quay.io/centos7/mariadb-103-centos7@sha256:' +os::cmd::expect_success_and_text "oc get is/newrepo --template='{{(index .status.tags 0 \"items\" 0).dockerImageReference}}'" '^quay.io/centos7/mariadb-105-centos7@sha256:' # when copying a tag that points to the internal registry, update the container image reference #os::cmd::expect_success "oc tag test:new newrepo:direct" #os::cmd::expect_success_and_text 'oc get istag/newrepo:direct -o jsonpath={.image.dockerImageReference}' "/$project/newrepo@sha256:" # test references -os::cmd::expect_success 'oc tag mariadb:10.3 reference:latest --reference' +os::cmd::expect_success 'oc tag mariadb:10.5 reference:latest --reference' os::cmd::expect_success_and_text "oc get is/reference --template='{{(index .spec.tags 0).from.kind}}'" 'ImageStreamImage' os::cmd::expect_success_and_text "oc get is/reference --template='{{(index .spec.tags 0).reference}}'" 'true' # create a second project to test tagging across projects os::cmd::expect_success 'oc new-project test-cmd-images-2' -os::cmd::expect_success "oc tag $project/mariadb:10.3 newrepo:latest" +os::cmd::expect_success "oc tag $project/mariadb:10.5 newrepo:latest" os::cmd::expect_success_and_text "oc get is/newrepo --template='{{(index .spec.tags 0).from.kind}}'" 'ImageStreamImage' -os::cmd::expect_success_and_text 'oc get istag/newrepo:latest -o jsonpath={.image.dockerImageReference}' 'quay.io/centos7/mariadb-103-centos7@sha256:' +os::cmd::expect_success_and_text 'oc get istag/newrepo:latest -o jsonpath={.image.dockerImageReference}' 'quay.io/centos7/mariadb-105-centos7@sha256:' # tag across projects without specifying the source's project os::cmd::expect_success_and_text "oc tag newrepo:latest '${project}/mariadb:tag1'" "mariadb:tag1 set to" os::cmd::expect_success_and_text "oc get is/newrepo --template='{{(index .spec.tags 0).name}}'" "latest" diff --git a/test/extended/testdata/cmd/test/cmd/images.sh b/test/extended/testdata/cmd/test/cmd/images.sh index b47bffe1a15b..a6796517e03d 100755 --- a/test/extended/testdata/cmd/test/cmd/images.sh +++ b/test/extended/testdata/cmd/test/cmd/images.sh @@ -132,7 +132,6 @@ os::cmd::expect_failure 'oc get imageStreams nodejs' os::cmd::expect_failure 'oc get imageStreams postgresql' os::cmd::expect_failure 'oc get imageStreams mongodb' os::cmd::expect_failure 'oc get imageStreams wildfly' -os::cmd::try_until_success 'oc get imagestreamTags mariadb:10.3' os::cmd::try_until_success 'oc get imagestreamTags mariadb:10.5' os::cmd::expect_success_and_text "oc get imagestreams mysql --template='{{ index .metadata.annotations \"openshift.io/image.dockerRepositoryCheck\"}}'" '[0-9]{4}\-[0-9]{2}\-[0-9]{2}' # expect a date like YYYY-MM-DD os::cmd::expect_success 'oc describe istag/mysql:latest' @@ -158,7 +157,7 @@ echo "imageStreams: ok" os::test::junit::declare_suite_end os::test::junit::declare_suite_start "cmd/images${IMAGES_TESTS_POSTFIX:-}/import-image" -# should follow the latest reference to 10.3 and update that, and leave latest unchanged +# should follow the latest reference to 10.5 and update that, and leave latest unchanged os::cmd::expect_success_and_text "oc get is/mariadb --template='{{(index .spec.tags 1).from.kind}}'" 'DockerImage' os::cmd::expect_success_and_text "oc get is/mariadb --template='{{(index .spec.tags 2).from.kind}}'" 'ImageStreamTag' os::cmd::expect_success_and_text "oc get is/mariadb --template='{{(index .spec.tags 2).from.name}}'" '10.5' @@ -171,7 +170,7 @@ os::cmd::expect_success_and_text "oc get is/mariadb --template='{{(index .spec.t os::cmd::expect_failure_and_text 'oc import-image mariadb --from=quay.io/openshifttest/hello-openshift:openshift' "use the 'tag' command if you want to change the source" os::cmd::expect_success 'oc describe is/mariadb' # import existing tag (explicit) -os::cmd::expect_success_and_text 'oc import-image mariadb:10.3' "sha256:" +os::cmd::expect_success_and_text 'oc import-image mariadb:10.5' "sha256:" os::cmd::expect_success_and_text 'oc import-image mariadb:latest' "sha256:" # import existing image stream creating new tag os::cmd::expect_success_and_text 'oc import-image mariadb:external --from=quay.io/openshifttest/hello-openshift:openshift' "sha256:" @@ -233,23 +232,23 @@ os::cmd::expect_success_and_text "oc get istag/mariadb:labeled -o jsonpath='{.me # test copying tags os::cmd::expect_success 'oc tag quay.io/openshift/origin-cli:4.6 newrepo:latest' os::cmd::expect_success_and_text "oc get is/newrepo --template='{{(index .spec.tags 0).from.kind}}'" 'DockerImage' -os::cmd::try_until_success 'oc get istag/mariadb:10.3' +os::cmd::try_until_success 'oc get istag/mariadb:10.5' # default behavior is to copy the current image, but since this is an external image we preserve the dockerImageReference -os::cmd::expect_success 'oc tag mariadb:10.3 newrepo:latest' +os::cmd::expect_success 'oc tag mariadb:10.5 newrepo:latest' os::cmd::expect_success_and_text "oc get is/newrepo --template='{{(index .spec.tags 0).from.kind}}'" 'ImageStreamImage' -os::cmd::expect_success_and_text "oc get is/newrepo --template='{{(index .status.tags 0 \"items\" 0).dockerImageReference}}'" '^quay.io/centos7/mariadb-103-centos7@sha256:' +os::cmd::expect_success_and_text "oc get is/newrepo --template='{{(index .status.tags 0 \"items\" 0).dockerImageReference}}'" '^quay.io/centos7/mariadb-105-centos7@sha256:' # when copying a tag that points to the internal registry, update the container image reference #os::cmd::expect_success "oc tag test:new newrepo:direct" #os::cmd::expect_success_and_text 'oc get istag/newrepo:direct -o jsonpath={.image.dockerImageReference}' "/$project/newrepo@sha256:" # test references -os::cmd::expect_success 'oc tag mariadb:10.3 reference:latest --reference' +os::cmd::expect_success 'oc tag mariadb:10.5 reference:latest --reference' os::cmd::expect_success_and_text "oc get is/reference --template='{{(index .spec.tags 0).from.kind}}'" 'ImageStreamImage' os::cmd::expect_success_and_text "oc get is/reference --template='{{(index .spec.tags 0).reference}}'" 'true' # create a second project to test tagging across projects os::cmd::expect_success 'oc new-project test-cmd-images-2' -os::cmd::expect_success "oc tag $project/mariadb:10.3 newrepo:latest" +os::cmd::expect_success "oc tag $project/mariadb:10.5 newrepo:latest" os::cmd::expect_success_and_text "oc get is/newrepo --template='{{(index .spec.tags 0).from.kind}}'" 'ImageStreamImage' -os::cmd::expect_success_and_text 'oc get istag/newrepo:latest -o jsonpath={.image.dockerImageReference}' 'quay.io/centos7/mariadb-103-centos7@sha256:' +os::cmd::expect_success_and_text 'oc get istag/newrepo:latest -o jsonpath={.image.dockerImageReference}' 'quay.io/centos7/mariadb-105-centos7@sha256:' # tag across projects without specifying the source's project os::cmd::expect_success_and_text "oc tag newrepo:latest '${project}/mariadb:tag1'" "mariadb:tag1 set to" os::cmd::expect_success_and_text "oc get is/newrepo --template='{{(index .spec.tags 0).name}}'" "latest"