BUILD-250 updating simples2i image for its multiarch analogue

Replaced quay.io/redhat-developer/test-build-simples2i:latest in Origin build tests with registry.ci.openshift.org/ocp/4.8:test-build-simples2i Latest image is multiarch - has multiple references of different architectures in its manifest.
openshift · May 25, 2021 · 1df47ac · 1df47ac
1 parent 6361aa8
commit 1df47ac
Show file tree

Hide file tree

Showing 19 changed files with 41 additions and 37 deletions.
diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go
diff --git a/test/extended/testdata/builds/build-postcommit/sti.yaml b/test/extended/testdata/builds/build-postcommit/sti.yaml
@@ -20,7 +20,7 @@ items:
       sourceStrategy:
         from:
           kind: DockerImage
-          name: quay.io/redhat-developer/test-build-simples2i:latest
+          name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
     resources: {}
     postCommit: {}
     nodeSelector: null

diff --git a/test/extended/testdata/builds/build-timing/test-s2i-build.json b/test/extended/testdata/builds/build-timing/test-s2i-build.json
@@ -18,7 +18,7 @@
       "sourceStrategy": {
         "from": {
           "kind": "DockerImage",
-          "name": "quay.io/redhat-developer/test-build-simples2i:latest"
+          "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
         },
         "env": [
           {

diff --git a/test/extended/testdata/builds/statusfail-failedassemble.yaml b/test/extended/testdata/builds/statusfail-failedassemble.yaml
@@ -10,4 +10,4 @@ spec:
     sourceStrategy:
       from:
         kind: DockerImage
-        name: quay.io/redhat-developer/test-build-simples2i:latest
+        name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
diff --git a/test/extended/testdata/builds/statusfail-postcommithook.yaml b/test/extended/testdata/builds/statusfail-postcommithook.yaml
@@ -13,5 +13,5 @@ spec:
     sourceStrategy:
       from:
         kind: DockerImage
-        name: quay.io/redhat-developer/test-build-simples2i:latest
+        name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
     type: Source
diff --git a/test/extended/testdata/builds/statusfail-pushtoregistry.yaml b/test/extended/testdata/builds/statusfail-pushtoregistry.yaml
@@ -15,5 +15,5 @@ spec:
     sourceStrategy:
       from:
         kind: DockerImage
-        name: quay.io/redhat-developer/test-build-simples2i:latest
+        name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
     type: Source
diff --git a/test/extended/testdata/builds/test-build-cluster-config.yaml b/test/extended/testdata/builds/test-build-cluster-config.yaml
@@ -15,7 +15,7 @@ items:
       sourceStrategy:
         from:
           kind: DockerImage
-          name: quay.io/redhat-developer/test-build-simples2i:latest
+          name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
       type: Source
 - apiVersion: build.openshift.io/v1
   kind: BuildConfig
@@ -33,5 +33,5 @@ items:
           value: "5"
         from:
           kind: DockerImage
-          name: quay.io/redhat-developer/test-build-simples2i:latest
+          name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
       type: Source
diff --git a/test/extended/testdata/builds/test-build-proxy.yaml b/test/extended/testdata/builds/test-build-proxy.yaml
@@ -35,7 +35,7 @@ items:
           value: 127.0.0.1:3128
         from:
           kind: DockerImage
-          name: quay.io/redhat-developer/test-build-simples2i:latest
+          name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
 - kind: BuildConfig
   apiVersion: v1
   metadata:
@@ -57,7 +57,7 @@ items:
       sourceStrategy:
         from:
           kind: DockerImage
-          name: quay.io/redhat-developer/test-build-simples2i:latest
+          name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
         env:
         - name: SOME_HTTP_PROXY
           value: https://envuser:password@proxy3.com

diff --git a/test/extended/testdata/builds/test-build-revision.json b/test/extended/testdata/builds/test-build-revision.json
@@ -22,7 +22,7 @@
           "sourceStrategy": {
             "from": {
               "kind": "DockerImage",
-              "name": "quay.io/redhat-developer/test-build-simples2i:latest"
+              "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
             }
           }
         },

diff --git a/test/extended/testdata/builds/test-nosrc-build.json b/test/extended/testdata/builds/test-nosrc-build.json
@@ -32,7 +32,7 @@
           "sourceStrategy": {
             "from": {
               "kind": "DockerImage",
-              "name": "quay.io/redhat-developer/test-build-simples2i:latest"
+              "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
             }
           }
         }

diff --git a/test/extended/testdata/builds/test-s2i-build-quota.json b/test/extended/testdata/builds/test-s2i-build-quota.json
@@ -24,8 +24,8 @@
       "type": "Source",
       "sourceStrategy": {
         "from": {
-          "kind":"DockerImage",
-          "name":"quay.io/redhat-developer/test-build-simples2i:latest"
+          "kind": "DockerImage",
+          "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
         },
         "env": [
           {

diff --git a/test/extended/testdata/builds/test-s2i-build.json b/test/extended/testdata/builds/test-s2i-build.json
@@ -26,7 +26,7 @@
         ],
         "from": {
           "kind": "DockerImage",
-          "name": "quay.io/redhat-developer/test-build-simples2i:latest"
+          "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
         }
       }
     },

diff --git a/test/extended/testdata/builds/test-s2i-no-outputname.json b/test/extended/testdata/builds/test-s2i-no-outputname.json
@@ -26,7 +26,7 @@
         ],
         "from": {
           "kind": "DockerImage",
-          "name": "quay.io/redhat-developer/test-build-simples2i:latest"
+          "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i"
         }
       }
     }

diff --git a/test/extended/testdata/builds/valuefrom/failed-sti-build-value-from-config.yaml b/test/extended/testdata/builds/valuefrom/failed-sti-build-value-from-config.yaml
@@ -16,7 +16,7 @@ spec:
     sourceStrategy:
       from:
         kind: DockerImage
-        name: quay.io/redhat-developer/test-build-simples2i:latest
+        name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
       env:
         - name: BUILD_LOGLEVEL
           value: "5"

diff --git a/test/extended/testdata/builds/valuefrom/successful-sti-build-value-from-config.yaml b/test/extended/testdata/builds/valuefrom/successful-sti-build-value-from-config.yaml
@@ -16,7 +16,7 @@ spec:
     sourceStrategy:
       from:
         kind: DockerImage
-        name: quay.io/redhat-developer/test-build-simples2i:latest
+        name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
       env:
         - name: BUILD_LOGLEVEL
           value: "5"

diff --git a/test/extended/testdata/templates/templateinstance_readiness.yaml b/test/extended/testdata/templates/templateinstance_readiness.yaml
@@ -49,7 +49,7 @@ objects:
       sourceStrategy:
         from:
           kind: DockerImage
-          name: quay.io/redhat-developer/test-build-simples2i:latest
+          name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
     output:
       to:
         kind: ImageStreamTag

diff --git a/test/extended/util/framework.go b/test/extended/util/framework.go
@@ -926,7 +926,7 @@ func WaitForABuild(c buildv1clienttyped.BuildInterface, name string, isOK, isFai
 		return err
 	}
 	// wait longer for the build to run to completion
-	err = wait.Poll(5*time.Second, 10*time.Minute, func() (bool, error) {
+	err = wait.Poll(5*time.Second, 15*time.Minute, func() (bool, error) {
 		list, err := c.List(context.Background(), metav1.ListOptions{FieldSelector: fields.Set{"metadata.name": name}.AsSelector().String()})
 		if err != nil {
 			e2e.Logf("error listing builds: %v", err)

diff --git a/test/extended/util/image/image.go b/test/extended/util/image/image.go
@@ -29,6 +29,9 @@ func init() {
 		// the github.com/openshift/build-test-images repo is built out of github.com/openshift/release
 		"registry.ci.openshift.org/ocp/4.8:test-build-roots2i": -1,
 
+		// used by all the rest build s2s e2e tests
+		"registry.ci.openshift.org/ocp/4.8:test-build-simples2i": -1,
+
 		// moved to GCR
 		"k8s.gcr.io/sig-storage/csi-attacher:v2.2.0":              -1,
 		"k8s.gcr.io/sig-storage/csi-attacher:v3.0.0":              -1,

diff --git a/test/extended/util/image/zz_generated.txt b/test/extended/util/image/zz_generated.txt
@@ -61,3 +61,4 @@ k8s.gcr.io/sig-storage/snapshot-controller:v2.1.1 quay.io/openshift/community-e2
 k8s.gcr.io/sig-storage/snapshot-controller:v3.0.2 quay.io/openshift/community-e2e-images:e2e-k8s-gcr-io-sig-storage-snapshot-controller-v3-0-2-IVmgAhsROusslTdY
 quay.io/redhat-developer/nfs-server:1.0 quay.io/openshift/community-e2e-images:e2e-quay-io-redhat-developer-nfs-server-1-0-Wz4GFQ2IuhYmh2mB
 registry.ci.openshift.org/ocp/4.8:test-build-roots2i quay.io/openshift/community-e2e-images:e2e-registry-ci-openshift-org-ocp-4-8-test-build-roots2i-FmW7zebvtGKkls4B
+registry.ci.openshift.org/ocp/4.8:test-build-simples2i quay.io/openshift/community-e2e-images:e2e-registry-ci-openshift-org-ocp-4-8-test-build-simples2i-7A9bkBd9X4G-ELh0