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:08:39 +0200 |
| commit | 8f130be577b00cb3ff9e1db6358e5d8bd1c50af8 (patch) | |
| tree | 4dd4fccfb11a5cc4f9a087bb99c1c0f265cf0f67 | |
| parent | cbe70ae26c26ef88339ab8fd48a5cbb8673e9152 (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 | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index ee75cc974..d1c2cf51d 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 @@ -44,7 +44,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:hunter|${repo}/functest-core:arm64-hunter|g" {} + find . -name Dockerfile -exec sed -i \ @@ -60,11 +60,11 @@ for dir in ${arm64_dirs}; do done [ -n "${arm64_dirs}" ] && (docker rmi "${repo}/functest-core:arm64-hunter" \ - multiarch/alpine:arm64-v3.9 || true) + 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:hunter|${repo}/functest-core:arm-hunter|g" {} + find . -name Dockerfile -exec sed -i \ @@ -80,7 +80,7 @@ for dir in ${arm_dirs}; do done [ -n "${arm_dirs}" ] && (docker rmi "${repo}/functest-core:arm-hunter" \ - multiarch/alpine:armhf-v3.9 || true) + arm32v6/alpine:3.9 || true) find . -name Dockerfile -exec git checkout {} + exit $? |