diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-05-01 16:04:26 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-05-01 16:06:47 +0200 |
| commit | 85911ba938c3619a4610ffcfc5ecdf63f3b5d7e3 (patch) | |
| tree | af3c31294a0c1a35e8ab9d050024d2ec47f42658 | |
| parent | c962403019dd90689cffd6d411ee8e132696416a (diff) | |
Use official images instead of multiarch
Change-Id: I5031a19691966f1a5d63dc7dbd9c3254beed9a03
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 29cfe2a019663911e7ca5b2fee637e3bf494e1d6)
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | build.sh | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 4fb071f2e..e9a1cbc10 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.6 python3.6-dev @@ -42,7 +42,7 @@ done find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.9|multiarch/alpine:arm64-v3.9|g" {} + + -e "s|alpine:3.9|arm64v8/alpine:3.9|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core:iruya|${repo}/functest-core:arm64-iruya|g" {} + find . -name Dockerfile -exec sed -i \ @@ -57,12 +57,12 @@ for dir in ${arm64_dirs}; do (docker rmi "${repo}/functest-${dir##**/}:arm64-iruya" || true) done [ -n "${arm64_dirs}" ] && - (docker rmi "${repo}/functest-core:arm64-iruya" \ - multiarch/alpine:arm64-v3.9 || true) + (docker rmi "${repo}/functest-core:arm64-jerma" \ + arm64v8/alpine:3.9 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.9|multiarch/alpine:armhf-v3.9|g" {} + + -e "s|alpine:3.9|arm32v6/alpine:3.9|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core:iruya|${repo}/functest-core:arm-iruya|g" {} + find . -name Dockerfile -exec sed -i \ @@ -76,8 +76,8 @@ for dir in ${arm_dirs}; do (docker rmi "${repo}/functest-${dir##**/}:arm-iruya" || true) done [ -n "${arm_dirs}" ] && - (docker rmi "${repo}/functest-core:arm-iruya" \ - multiarch/alpine:armhf-v3.9 || true) + (docker rmi "${repo}/functest-core:arm-jerma" \ + arm32v6/alpine:3.9 || true) find . -name Dockerfile -exec git checkout {} + exit $? |