Skip to content

Commit

Permalink
BUILD-250 updating simples2i image for its multiarch analogue
Browse files Browse the repository at this point in the history
Replaced quay.io/redhat-developer/test-build-simples2i:latest
in Origin build tests with
quay.io/multi-arch/test-build-simples2i:ubi8
Latest image is multiarch - has multiple references of different
architectures in its manifest.
  • Loading branch information
Alice Rum committed May 12, 2021
1 parent 4ed12a0 commit 7ca2447
Show file tree
Hide file tree
Showing 16 changed files with 36 additions and 36 deletions.
36 changes: 18 additions & 18 deletions test/extended/testdata/bindata.go

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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions test/extended/testdata/builds/test-build-cluster-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 2 additions & 2 deletions test/extended/testdata/builds/test-build-proxy.yaml
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: quay.io/redhat-developer/test-build-simples2i:latest
name: registry.ci.openshift.org/ocp/4.8:test-build-simples2i
- kind: BuildConfig
apiVersion: v1
metadata:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/test-build-revision.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/test-nosrc-build.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions test/extended/testdata/builds/test-s2i-build-quota.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/test-s2i-build.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion test/extended/testdata/builds/test-s2i-no-outputname.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7ca2447

Please sign in to comment.