fix up ruby-25-centos7 tag check logic

openshift · Dec 18, 2019 · e1f630e · e1f630e
1 parent fe19c11
commit e1f630e
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 20 deletions.
diff --git a/examples/sample-app/application-template-dockerbuild.json b/examples/sample-app/application-template-dockerbuild.json
@@ -86,10 +86,15 @@
         "name": "ruby-25-centos7"
       },
       "spec": {
-        "dockerImageRepository": "centos/ruby-25-centos7"
-      },
-      "status": {
-        "dockerImageRepository": ""
+        "tags": [
+          {
+            "from": {
+              "kind": "DockerImage",
+              "name": "docker.io/centos/ruby-25-centos7:latest"
+            },
+            "name": "latest"
+          }
+        ]
       }
     },
     {

diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go
diff --git a/test/extended/testdata/cmd/test/cmd/builds.sh b/test/extended/testdata/cmd/test/cmd/builds.sh
@@ -77,8 +77,7 @@ os::cmd::expect_success 'oc get bc'
 os::cmd::expect_success 'oc get builds'
 
 # make sure the imagestream has the latest tag before trying to test it or start a build with it
-# TODO: (bparees): Uncomment this when this line stop timing out
-# os::cmd::try_until_text 'oc get is ruby-25-centos7' 'latest'
+os::cmd::try_until_success 'oc get istag ruby-25-centos7:latest'
 
 os::test::junit::declare_suite_start "cmd/builds/patch-anon-fields"
 REAL_OUTPUT_TO=$(oc get bc/ruby-sample-build --template='{{ .spec.output.to.name }}')

diff --git a/test/extended/testdata/cmd/test/cmd/testdata/application-template-dockerbuild.json b/test/extended/testdata/cmd/test/cmd/testdata/application-template-dockerbuild.json
@@ -86,10 +86,15 @@
         "name": "ruby-25-centos7"
       },
       "spec": {
-        "dockerImageRepository": "centos/ruby-25-centos7"
-      },
-      "status": {
-        "dockerImageRepository": ""
+        "tags": [
+          {
+            "from": {
+              "kind": "DockerImage",
+              "name": "docker.io/centos/ruby-25-centos7:latest"
+            },
+            "name": "latest"
+          }
+        ]
       }
     },
     {