Skip to content

Commit 2dbe4f4

Browse files
committed
disable multiarch import tests
1 parent 21f535d commit 2dbe4f4

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

test/cmd/images.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,12 @@ os::cmd::expect_success_and_text "oc describe ${imagename}" 'Image Created:'
143143
os::cmd::expect_success_and_text "oc describe ${imagename}" 'Image Name:'
144144

145145
# 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'
152152
echo "imageStreams: ok"
153153
os::test::junit::declare_suite_end
154154

Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
apiVersion: v1
22
kind: ImageStream
33
metadata:
4-
name: test-nginx-multiarch-stream
4+
name: test-multiarch-stream
55
spec:
66
tags:
77
- name: linux-amd64
88
from:
99
kind: DockerImage
10-
name: nginx:latest
10+
name: bparees/multiplatformtest:latest
1111
annotations:
1212
importer.image.openshift.io/prefer-os: linux
1313
importer.image.openshift.io/prefer-arch: amd64
14-
- name: linux-ppc64le
14+
- name: linux-s390x
1515
from:
1616
kind: DockerImage
17-
name: nginx:latest
17+
name: bparees/multiplatformtest:latest
1818
annotations:
1919
importer.image.openshift.io/prefer-os: linux
20-
importer.image.openshift.io/prefer-arch: ppc64le
20+
importer.image.openshift.io/prefer-arch: s390x

0 commit comments

Comments
 (0)