Skip to content

Adjust build test images for multi-arch support #26598

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Dec 8, 2021
Merged

Adjust build test images for multi-arch support #26598

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8ff5c2
Bump nfs-server version for multi-arch support
yselkowitz Nov 12, 2021
141d957
Relocate test-build-*s2i images for multi-arch support
yselkowitz Nov 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/extended/builds/s2i_root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())

Expand Down Expand Up @@ -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())

Expand Down
38 changes: 19 additions & 19 deletions test/extended/testdata/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion test/extended/testdata/builds/build-postcommit/sti.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/build-timing/test-s2i-build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/statusfail-failedassemble.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/statusfail-postcommithook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/statusfail-pushtoregistry.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions test/extended/testdata/builds/test-build-cluster-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions test/extended/testdata/builds/test-build-proxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/test-build-revision.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/test-nosrc-build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/test-s2i-build-quota.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/test-s2i-build.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/test-s2i-no-outputname.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/valuefrom/failed-sti-build-value-from-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/valuefrom/successful-sti-build-value-from-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/volumes/docker-buildconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/volumes/s2i-buildconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/templates/templateinstance_readiness.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions test/extended/util/image/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions test/extended/util/image/zz_generated.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
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/nfs-server:1.1 quay.io/openshift/community-e2e-images:e2e-quay-io-redhat-developer-nfs-server-1-1-dlXGfzrk5aNo8EjC
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
2 changes: 1 addition & 1 deletion test/extended/util/nfs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"},
}
Expand Down