File tree 2 files changed +11
-11
lines changed
2 files changed +11
-11
lines changed Original file line number Diff line number Diff line change @@ -143,12 +143,12 @@ os::cmd::expect_success_and_text "oc describe ${imagename}" 'Image Created:'
143
143
os::cmd::expect_success_and_text " oc describe ${imagename} " ' Image Name:'
144
144
145
145
# test prefer-os and prefer-arch annotations
146
- os::cmd::expect_success ' oc create -f test/testdata/test-nginx- multiarch-stream.yaml'
147
- os::cmd::try_until_success ' oc get istag test-nginx- multiarch-stream:linux-amd64'
148
- os::cmd::try_until_success ' oc get istag test-nginx- multiarch-stream:linux-ppc64le '
149
- os::cmd::expect_success_and_text ' oc get istag test-nginx- multiarch-stream:linux-amd64 --template={{.image.dockerImageMetadata.Architecture}}' ' amd64'
150
- os::cmd::expect_success_and_text ' oc get istag test-nginx- multiarch-stream:linux-ppc64le --template={{.image.dockerImageMetadata.Architecture}}' ' ppc64le '
151
- os::cmd::expect_success ' oc delete is test-nginx- multiarch-stream'
146
+ os::cmd::expect_success ' oc create -f test/testdata/test-multiarch-stream.yaml'
147
+ os::cmd::try_until_success ' oc get istag test-multiarch-stream:linux-amd64'
148
+ os::cmd::try_until_success ' oc get istag test-multiarch-stream:linux-s390x '
149
+ os::cmd::expect_success_and_text ' oc get istag test-multiarch-stream:linux-amd64 --template={{.image.dockerImageMetadata.Architecture}}' ' amd64'
150
+ os::cmd::expect_success_and_text ' oc get istag test-multiarch-stream:linux-s390x --template={{.image.dockerImageMetadata.Architecture}}' ' s390x '
151
+ os::cmd::expect_success ' oc delete is test-multiarch-stream'
152
152
echo " imageStreams: ok"
153
153
os::test::junit::declare_suite_end
154
154
Original file line number Diff line number Diff line change 1
1
apiVersion : v1
2
2
kind : ImageStream
3
3
metadata :
4
- name : test-nginx- multiarch-stream
4
+ name : test-multiarch-stream
5
5
spec :
6
6
tags :
7
7
- name : linux-amd64
8
8
from :
9
9
kind : DockerImage
10
- name : nginx :latest
10
+ name : bparees/multiplatformtest :latest
11
11
annotations :
12
12
importer.image.openshift.io/prefer-os : linux
13
13
importer.image.openshift.io/prefer-arch : amd64
14
- - name : linux-ppc64le
14
+ - name : linux-s390x
15
15
from :
16
16
kind : DockerImage
17
- name : nginx :latest
17
+ name : bparees/multiplatformtest :latest
18
18
annotations :
19
19
importer.image.openshift.io/prefer-os : linux
20
- importer.image.openshift.io/prefer-arch : ppc64le
20
+ importer.image.openshift.io/prefer-arch : s390x
You can’t perform that action at this time.
0 commit comments