From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Fri, 1 May 2020 14:04:26 +0000 (+0200)
Subject: Use official images instead of multiarch
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=29cfe2a019663911e7ca5b2fee637e3bf494e1d6;p=functest.git

Use official images instead of multiarch

Change-Id: I5031a19691966f1a5d63dc7dbd9c3254beed9a03
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/.travis.yml b/.travis.yml
index cfd84f8c0..3ef017c04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,8 @@ addons:
       - libssl1.0.0
 
 before_script:
-  - sudo apt-get -y install qemu-user-static enchant
+  - sudo apt-get -y install enchant
+  - sudo docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
   - sudo add-apt-repository -y ppa:deadsnakes/ppa
   - sudo apt-get update
   - sudo apt-get install python3.7 python3.7-dev
diff --git a/build.sh b/build.sh
index b104aedfb..b83a78b41 100644
--- a/build.sh
+++ b/build.sh
@@ -40,7 +40,7 @@ done
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|alpine:3.10|multiarch/alpine:arm64-v3.10|g" {} +
+    -e "s|alpine:3.10|arm64v8/alpine:3.10|g" {} +
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-core:jerma|${repo}/functest-core:arm64-jerma|g" {} +
 find . -name Dockerfile -exec sed -i \
@@ -56,11 +56,11 @@ for dir in ${arm64_dirs}; do
 done
 [ -n "${arm64_dirs}" ] &&
     (docker rmi "${repo}/functest-core:arm64-jerma" \
-        multiarch/alpine:arm64-v3.10 || true)
+        arm64v8/alpine:3.10 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|alpine:3.10|multiarch/alpine:armhf-v3.10|g" {} +
+    -e "s|alpine:3.10|arm32v6/alpine:3.10|g" {} +
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-core:jerma|${repo}/functest-core:arm-jerma|g" {} +
 find . -name Dockerfile -exec sed -i \
@@ -76,7 +76,7 @@ for dir in ${arm_dirs}; do
 done
 [ -n "${arm_dirs}" ] &&
     (docker rmi "${repo}/functest-core:arm-jerma" \
-        multiarch/alpine:armhf-v3.10 || true)
+        arm32v6/alpine:3.10 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?