Skip to content

Commit

Permalink
Merge pull request #20521 from bparees/newapp
Browse files Browse the repository at this point in the history
check for tag before proceeding with new-app test
  • Loading branch information
openshift-merge-robot authored Aug 3, 2018
2 parents 8446a5c + 4c0463b commit 675772c
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions test/cmd/newapp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,8 @@ os::cmd::expect_success 'oc delete imagestreams --all'

# newapp does not attempt to create an imagestream that already exists for a Docker image
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'
# make sure the ruby:latest tag is imported before we run new-app again
os::cmd::try_until_success 'oc get imagestreamtags ruby:latest'
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'
os::cmd::expect_success 'oc delete all -l app=testapp2'
os::cmd::expect_success 'oc delete all -l app=testapp1'
Expand Down

0 comments on commit 675772c

Please sign in to comment.