Skip to content

Commit 675772c

Browse files
Merge pull request #20521 from bparees/newapp
check for tag before proceeding with new-app test
2 parents 8446a5c + 4c0463b commit 675772c

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

test/cmd/newapp.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,8 @@ os::cmd::expect_success 'oc delete imagestreams --all'
437437

438438
# newapp does not attempt to create an imagestream that already exists for a Docker image
439439
os::cmd::expect_success_and_text 'oc new-app docker.io/ruby:latest~https://github.com/sclorg/ruby-ex.git --name=testapp1 --strategy=docker' 'imagestream.image.openshift.io "ruby" created'
440+
# make sure the ruby:latest tag is imported before we run new-app again
441+
os::cmd::try_until_success 'oc get imagestreamtags ruby:latest'
440442
os::cmd::expect_success_and_not_text 'oc new-app docker.io/ruby:latest~https://github.com/sclorg/ruby-ex.git --name=testapp2 --strategy=docker' '"ruby:latest" already exists'
441443
os::cmd::expect_success 'oc delete all -l app=testapp2'
442444
os::cmd::expect_success 'oc delete all -l app=testapp1'

0 commit comments

Comments
 (0)