disable multiarch import tests

openshift · Nov 23, 2017 · 2dbe4f4 · 2dbe4f4
1 parent 21f535d
commit 2dbe4f4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/test/cmd/images.sh b/test/cmd/images.sh
@@ -143,12 +143,12 @@ os::cmd::expect_success_and_text "oc describe ${imagename}" 'Image Created:'
 os::cmd::expect_success_and_text "oc describe ${imagename}" 'Image Name:'
 
 # test prefer-os and prefer-arch annotations
-os::cmd::expect_success 'oc create -f test/testdata/test-nginx-multiarch-stream.yaml'
-os::cmd::try_until_success 'oc get istag test-nginx-multiarch-stream:linux-amd64'
-os::cmd::try_until_success 'oc get istag test-nginx-multiarch-stream:linux-ppc64le'
-os::cmd::expect_success_and_text 'oc get istag test-nginx-multiarch-stream:linux-amd64 --template={{.image.dockerImageMetadata.Architecture}}' 'amd64'
-os::cmd::expect_success_and_text 'oc get istag test-nginx-multiarch-stream:linux-ppc64le --template={{.image.dockerImageMetadata.Architecture}}' 'ppc64le'
-os::cmd::expect_success 'oc delete is test-nginx-multiarch-stream'
+os::cmd::expect_success 'oc create -f test/testdata/test-multiarch-stream.yaml'
+os::cmd::try_until_success 'oc get istag test-multiarch-stream:linux-amd64'
+os::cmd::try_until_success 'oc get istag test-multiarch-stream:linux-s390x'
+os::cmd::expect_success_and_text 'oc get istag test-multiarch-stream:linux-amd64 --template={{.image.dockerImageMetadata.Architecture}}' 'amd64'
+os::cmd::expect_success_and_text 'oc get istag test-multiarch-stream:linux-s390x --template={{.image.dockerImageMetadata.Architecture}}' 's390x'
+os::cmd::expect_success 'oc delete is test-multiarch-stream'
 echo "imageStreams: ok"
 os::test::junit::declare_suite_end
 

diff --git a/...testdata/test-nginx-multiarch-stream.yaml → test/testdata/test-multiarch-stream.yaml b/...testdata/test-nginx-multiarch-stream.yaml → test/testdata/test-multiarch-stream.yaml
@@ -1,20 +1,20 @@
 apiVersion: v1
 kind: ImageStream
 metadata:
-  name: test-nginx-multiarch-stream
+  name: test-multiarch-stream
 spec:
   tags:
   - name: linux-amd64
     from:
       kind: DockerImage
-      name: nginx:latest
+      name: bparees/multiplatformtest:latest
     annotations:
       importer.image.openshift.io/prefer-os: linux
       importer.image.openshift.io/prefer-arch: amd64
-  - name: linux-ppc64le
+  - name: linux-s390x
     from:
       kind: DockerImage
-      name: nginx:latest
+      name: bparees/multiplatformtest:latest
     annotations:
       importer.image.openshift.io/prefer-os: linux
-      importer.image.openshift.io/prefer-arch: ppc64le
+      importer.image.openshift.io/prefer-arch: s390x