From d8ff5c2f62c4af38ff1e483a8fd1d672ead8434c Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 11 Nov 2021 23:42:21 -0500 Subject: [PATCH 1/2] Bump nfs-server version for multi-arch support --- test/extended/util/image/image.go | 2 +- test/extended/util/image/zz_generated.txt | 2 +- test/extended/util/nfs.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/extended/util/image/image.go b/test/extended/util/image/image.go index 8c46cd55ce86..f2d8bec52ae8 100644 --- a/test/extended/util/image/image.go +++ b/test/extended/util/image/image.go @@ -14,7 +14,7 @@ import ( func init() { allowedImages = map[string]int{ // used by jenkins tests - "quay.io/redhat-developer/nfs-server:1.0": -1, + "quay.io/redhat-developer/nfs-server:1.1": -1, // used by open ldap tests "docker.io/mrogers950/origin-openldap-test:fedora29": -1, diff --git a/test/extended/util/image/zz_generated.txt b/test/extended/util/image/zz_generated.txt index a450ee72421b..7bc9b24c25fb 100644 --- a/test/extended/util/image/zz_generated.txt +++ b/test/extended/util/image/zz_generated.txt @@ -57,6 +57,6 @@ k8s.gcr.io/sig-storage/mock-driver:v4.1.0 quay.io/openshift/community-e2e-images k8s.gcr.io/sig-storage/nfs-provisioner:v2.2.2 quay.io/openshift/community-e2e-images:e2e-22-k8s-gcr-io-sig-storage-nfs-provisioner-v2-2-2-dbgtOCwYmEGggl01 k8s.gcr.io/sig-storage/snapshot-controller:v2.1.1 quay.io/openshift/community-e2e-images:e2e-k8s-gcr-io-sig-storage-snapshot-controller-v2-1-1-n5BM_jX2npV3RxHM 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 +quay.io/redhat-developer/nfs-server:1.1 quay.io/openshift/community-e2e-images:e2e-quay-io-redhat-developer-nfs-server-1-1-dlXGfzrk5aNo8EjC 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 diff --git a/test/extended/util/nfs.go b/test/extended/util/nfs.go index b8e235892053..36dd3ca5e314 100644 --- a/test/extended/util/nfs.go +++ b/test/extended/util/nfs.go @@ -32,7 +32,7 @@ func SetupK8SNFSServerAndVolume(oc *CLI, count int) (*kapiv1.Pod, []*kapiv1.Pers // additional nfs mounts to allow for openshift extended tests with // replicas and shared state (formerly mongo, postgresql, mysql, etc., now only jenkins); defined // in repo https://github.com/redhat-developer/nfs-server - ServerImage: image.LocationFor("quay.io/redhat-developer/nfs-server:1.0"), + ServerImage: image.LocationFor("quay.io/redhat-developer/nfs-server:1.1"), ServerPorts: []int{2049}, ServerVolumes: map[string]string{"": "/exports"}, } From 141d95765c52ed7a52619c68826245a8aad78fff Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 18 Nov 2021 01:11:30 -0500 Subject: [PATCH 2/2] Relocate test-build-*s2i images for multi-arch support --- test/extended/builds/s2i_root.go | 4 +- test/extended/testdata/bindata.go | 38 +++++++++---------- .../testdata/builds/build-postcommit/sti.yaml | 2 +- .../builds/build-timing/test-s2i-build.json | 2 +- .../builds/statusfail-failedassemble.yaml | 2 +- .../builds/statusfail-postcommithook.yaml | 2 +- .../builds/statusfail-pushtoregistry.yaml | 2 +- .../builds/test-build-cluster-config.yaml | 4 +- .../testdata/builds/test-build-proxy.yaml | 4 +- .../testdata/builds/test-build-revision.json | 2 +- .../testdata/builds/test-nosrc-build.json | 2 +- .../testdata/builds/test-s2i-build-quota.json | 2 +- .../testdata/builds/test-s2i-build.json | 2 +- .../builds/test-s2i-no-outputname.json | 2 +- .../failed-sti-build-value-from-config.yaml | 2 +- ...uccessful-sti-build-value-from-config.yaml | 2 +- .../builds/volumes/docker-buildconfig.yaml | 2 +- .../builds/volumes/s2i-buildconfig.yaml | 2 +- .../templates/templateinstance_readiness.yaml | 2 +- test/extended/util/image/image.go | 4 +- test/extended/util/image/zz_generated.txt | 4 +- 21 files changed, 44 insertions(+), 44 deletions(-) diff --git a/test/extended/builds/s2i_root.go b/test/extended/builds/s2i_root.go index c5a0c49314b7..32f66dbac141 100644 --- a/test/extended/builds/s2i_root.go +++ b/test/extended/builds/s2i_root.go @@ -37,7 +37,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] s2i build with a root user imag Before(oc) defer After(oc) - firstArgString := fmt.Sprintf("%s~https://github.com/sclorg/nodejs-ex", image.LocationFor("registry.ci.openshift.org/ocp/4.8:test-build-roots2i")) + firstArgString := fmt.Sprintf("%s~https://github.com/sclorg/nodejs-ex", image.LocationFor("quay.io/redhat-developer/test-build-roots2i:1.2")) err := oc.Run("new-app").Args(firstArgString, "--name", "nodejsfail").Execute() o.Expect(err).NotTo(o.HaveOccurred()) @@ -114,7 +114,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] s2i build with a root user imag roleBinding, err = oc.AdminKubeClient().RbacV1().RoleBindings(oc.Namespace()).Create(context.Background(), roleBinding, metav1.CreateOptions{}) o.Expect(err).NotTo(o.HaveOccurred()) - firstArgString := fmt.Sprintf("%s~https://github.com/sclorg/nodejs-ex", image.LocationFor("registry.ci.openshift.org/ocp/4.8:test-build-roots2i")) + firstArgString := fmt.Sprintf("%s~https://github.com/sclorg/nodejs-ex", image.LocationFor("quay.io/redhat-developer/test-build-roots2i:1.2")) err = oc.Run("new-build").Args(firstArgString, "--name", "nodejspass").Execute() o.Expect(err).NotTo(o.HaveOccurred()) diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go index f427a2ce4029..3e5d62c4c31f 100644 --- a/test/extended/testdata/bindata.go +++ b/test/extended/testdata/bindata.go @@ -17140,7 +17140,7 @@ items: sourceStrategy: from: kind: DockerImage - name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 resources: {} postCommit: {} nodeSelector: null @@ -18259,7 +18259,7 @@ var _testExtendedTestdataBuildsBuildTimingTestS2iBuildJson = []byte(`{ "sourceStrategy": { "from": { "kind": "DockerImage", - "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i" + "name": "quay.io/redhat-developer/test-build-simples2i:1.2" }, "env": [ { @@ -18805,7 +18805,7 @@ spec: sourceStrategy: from: kind: DockerImage - name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 `) func testExtendedTestdataBuildsStatusfailFailedassembleYamlBytes() ([]byte, error) { @@ -19040,7 +19040,7 @@ spec: sourceStrategy: from: kind: DockerImage - name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 type: Source `) @@ -19076,7 +19076,7 @@ spec: sourceStrategy: from: kind: DockerImage - name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 type: Source `) @@ -19305,7 +19305,7 @@ items: sourceStrategy: from: kind: DockerImage - name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 type: Source - apiVersion: build.openshift.io/v1 kind: BuildConfig @@ -19323,7 +19323,7 @@ items: value: "5" from: kind: DockerImage - name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 type: Source `) @@ -19452,7 +19452,7 @@ items: value: 127.0.0.1:3128 from: kind: DockerImage - name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 - kind: BuildConfig apiVersion: v1 metadata: @@ -19474,7 +19474,7 @@ items: sourceStrategy: from: kind: DockerImage - name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 env: - name: SOME_HTTP_PROXY value: https://envuser:password@proxy3.com @@ -19564,7 +19564,7 @@ var _testExtendedTestdataBuildsTestBuildRevisionJson = []byte(`{ "sourceStrategy": { "from": { "kind": "DockerImage", - "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i" + "name": "quay.io/redhat-developer/test-build-simples2i:1.2" } } }, @@ -21073,7 +21073,7 @@ var _testExtendedTestdataBuildsTestNosrcBuildJson = []byte(`{ "sourceStrategy": { "from": { "kind": "DockerImage", - "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i" + "name": "quay.io/redhat-developer/test-build-simples2i:1.2" } } } @@ -21125,7 +21125,7 @@ var _testExtendedTestdataBuildsTestS2iBuildQuotaJson = []byte(`{ "sourceStrategy": { "from": { "kind": "DockerImage", - "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i" + "name": "quay.io/redhat-developer/test-build-simples2i:1.2" }, "env": [ { @@ -21182,7 +21182,7 @@ var _testExtendedTestdataBuildsTestS2iBuildJson = []byte(`{ ], "from": { "kind": "DockerImage", - "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i" + "name": "quay.io/redhat-developer/test-build-simples2i:1.2" } } }, @@ -21253,7 +21253,7 @@ var _testExtendedTestdataBuildsTestS2iNoOutputnameJson = []byte(`{ ], "from": { "kind": "DockerImage", - "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i" + "name": "quay.io/redhat-developer/test-build-simples2i:1.2" } } } @@ -21399,7 +21399,7 @@ spec: sourceStrategy: from: kind: DockerImage - name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 env: - name: BUILD_LOGLEVEL value: "5" @@ -21535,7 +21535,7 @@ spec: sourceStrategy: from: kind: DockerImage - name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 env: - name: BUILD_LOGLEVEL value: "5" @@ -21702,7 +21702,7 @@ spec: runPolicy: Serial source: dockerfile: - 'FROM registry.ci.openshift.org/ocp/4.8:test-build-simples2i' + 'FROM quay.io/redhat-developer/test-build-simples2i:1.2' strategy: type: Docker dockerStrategy: @@ -21840,7 +21840,7 @@ spec: sourceStrategy: from: kind: DockerImage - name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 volumes: - mounts: - destinationPath: "/var/run/secrets/some-secret" @@ -52480,7 +52480,7 @@ objects: sourceStrategy: from: kind: DockerImage - name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 output: to: kind: ImageStreamTag diff --git a/test/extended/testdata/builds/build-postcommit/sti.yaml b/test/extended/testdata/builds/build-postcommit/sti.yaml index 6ec3485f8316..bc5045f309bd 100644 --- 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: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 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 index 2a926ba57967..5bef4c45adc0 100644 --- 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": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i" + "name": "quay.io/redhat-developer/test-build-simples2i:1.2" }, "env": [ { diff --git a/test/extended/testdata/builds/statusfail-failedassemble.yaml b/test/extended/testdata/builds/statusfail-failedassemble.yaml index 08d44a82fa59..c4165511932c 100644 --- 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: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 diff --git a/test/extended/testdata/builds/statusfail-postcommithook.yaml b/test/extended/testdata/builds/statusfail-postcommithook.yaml index 3e70a038e811..7076c007efb8 100644 --- 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: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 type: Source diff --git a/test/extended/testdata/builds/statusfail-pushtoregistry.yaml b/test/extended/testdata/builds/statusfail-pushtoregistry.yaml index 0be73d354db5..ef8d5761d043 100644 --- 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: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 type: Source diff --git a/test/extended/testdata/builds/test-build-cluster-config.yaml b/test/extended/testdata/builds/test-build-cluster-config.yaml index 13234d1ba10a..cb9b61e23b2b 100644 --- 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: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 type: Source - apiVersion: build.openshift.io/v1 kind: BuildConfig @@ -33,5 +33,5 @@ items: value: "5" from: kind: DockerImage - name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 type: Source diff --git a/test/extended/testdata/builds/test-build-proxy.yaml b/test/extended/testdata/builds/test-build-proxy.yaml index 55f63b6b6add..0497552a3239 100644 --- 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: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 - kind: BuildConfig apiVersion: v1 metadata: @@ -57,7 +57,7 @@ items: sourceStrategy: from: kind: DockerImage - name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 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 index 5ff09e28ba82..3b80523f1462 100644 --- 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": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i" + "name": "quay.io/redhat-developer/test-build-simples2i:1.2" } } }, diff --git a/test/extended/testdata/builds/test-nosrc-build.json b/test/extended/testdata/builds/test-nosrc-build.json index 3382b2bcecee..b6eb26a75114 100644 --- 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": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i" + "name": "quay.io/redhat-developer/test-build-simples2i:1.2" } } } diff --git a/test/extended/testdata/builds/test-s2i-build-quota.json b/test/extended/testdata/builds/test-s2i-build-quota.json index 65d7513ab8c4..627c6a347b09 100644 --- a/test/extended/testdata/builds/test-s2i-build-quota.json +++ b/test/extended/testdata/builds/test-s2i-build-quota.json @@ -25,7 +25,7 @@ "sourceStrategy": { "from": { "kind": "DockerImage", - "name": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i" + "name": "quay.io/redhat-developer/test-build-simples2i:1.2" }, "env": [ { diff --git a/test/extended/testdata/builds/test-s2i-build.json b/test/extended/testdata/builds/test-s2i-build.json index d485c955eb90..6c080d8460b6 100644 --- 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": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i" + "name": "quay.io/redhat-developer/test-build-simples2i:1.2" } } }, diff --git a/test/extended/testdata/builds/test-s2i-no-outputname.json b/test/extended/testdata/builds/test-s2i-no-outputname.json index 259e1283960b..95da2687ebfd 100644 --- 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": "registry.ci.openshift.org/ocp/4.8:test-build-simples2i" + "name": "quay.io/redhat-developer/test-build-simples2i:1.2" } } } 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 index 1662a946b145..ebd6037cd9c5 100644 --- 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: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 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 index b2eca21b7e46..c9abe2701066 100644 --- 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: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 env: - name: BUILD_LOGLEVEL value: "5" diff --git a/test/extended/testdata/builds/volumes/docker-buildconfig.yaml b/test/extended/testdata/builds/volumes/docker-buildconfig.yaml index 46ba13a8a323..f08a948a2b25 100644 --- a/test/extended/testdata/builds/volumes/docker-buildconfig.yaml +++ b/test/extended/testdata/builds/volumes/docker-buildconfig.yaml @@ -15,7 +15,7 @@ spec: runPolicy: Serial source: dockerfile: - 'FROM registry.ci.openshift.org/ocp/4.8:test-build-simples2i' + 'FROM quay.io/redhat-developer/test-build-simples2i:1.2' strategy: type: Docker dockerStrategy: diff --git a/test/extended/testdata/builds/volumes/s2i-buildconfig.yaml b/test/extended/testdata/builds/volumes/s2i-buildconfig.yaml index ee5f39c16511..a1c6aceb7311 100644 --- a/test/extended/testdata/builds/volumes/s2i-buildconfig.yaml +++ b/test/extended/testdata/builds/volumes/s2i-buildconfig.yaml @@ -21,7 +21,7 @@ spec: sourceStrategy: from: kind: DockerImage - name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 volumes: - mounts: - destinationPath: "/var/run/secrets/some-secret" diff --git a/test/extended/testdata/templates/templateinstance_readiness.yaml b/test/extended/testdata/templates/templateinstance_readiness.yaml index 515b163a0153..963d65307249 100644 --- 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: registry.ci.openshift.org/ocp/4.8:test-build-simples2i + name: quay.io/redhat-developer/test-build-simples2i:1.2 output: to: kind: ImageStreamTag diff --git a/test/extended/util/image/image.go b/test/extended/util/image/image.go index f2d8bec52ae8..35a16a73ca36 100644 --- a/test/extended/util/image/image.go +++ b/test/extended/util/image/image.go @@ -27,10 +27,10 @@ func init() { // used by build s2i e2e's to verify that builder with USER root are not allowed // 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, + "quay.io/redhat-developer/test-build-roots2i:1.2": -1, // used by all the rest build s2s e2e tests - "registry.ci.openshift.org/ocp/4.8:test-build-simples2i": -1, + "quay.io/redhat-developer/test-build-simples2i:1.2": -1, // moved to GCR "k8s.gcr.io/sig-storage/csi-attacher:v3.1.0": -1, diff --git a/test/extended/util/image/zz_generated.txt b/test/extended/util/image/zz_generated.txt index 7bc9b24c25fb..9a6d8293fbfc 100644 --- a/test/extended/util/image/zz_generated.txt +++ b/test/extended/util/image/zz_generated.txt @@ -58,5 +58,5 @@ k8s.gcr.io/sig-storage/nfs-provisioner:v2.2.2 quay.io/openshift/community-e2e-im k8s.gcr.io/sig-storage/snapshot-controller:v2.1.1 quay.io/openshift/community-e2e-images:e2e-k8s-gcr-io-sig-storage-snapshot-controller-v2-1-1-n5BM_jX2npV3RxHM 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.1 quay.io/openshift/community-e2e-images:e2e-quay-io-redhat-developer-nfs-server-1-1-dlXGfzrk5aNo8EjC -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 +quay.io/redhat-developer/test-build-roots2i:1.2 quay.io/openshift/community-e2e-images:e2e-quay-io-redhat-developer-test-build-roots2i-1-2-gLJ7WcnS2TSllJ32 +quay.io/redhat-developer/test-build-simples2i:1.2 quay.io/openshift/community-e2e-images:e2e-quay-io-redhat-developer-test-build-simples2i-1-2-thirLMR-JKplfkmE