aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-10-13 10:38:38 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2017-10-13 10:50:18 +0200
commitfed72336e3b50b8441f233a2f122e482ee83ae8c (patch)
treeda1ba1c194136df029c1fd71066589943a567b86
parent188f6330f4c941e0b582116f9161b7b82528e2a7 (diff)
Conform with Docker ARCH names
It switches Docker tags: - x86_64 -> amd64 - aarch64 -> arm64 Conflicts: .travis.yml build.sh Change-Id: I05575dd728e7502a891a3ee3015f81ac8e3f7a92 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit a8acc48148313229b4e6771374ece9256d75b26c)
-rw-r--r--.travis.yml76
-rw-r--r--build.sh22
2 files changed, 46 insertions, 52 deletions
diff --git a/.travis.yml b/.travis.yml
index 4472885cc..3fbd56e1c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,119 +15,113 @@ jobs:
script: sudo -E bash build.sh
env:
- repo="${DOCKER_USERNAME}"
- - x86_64_dirs=""
- - aarch64_dirs="docker/core"
+ - amd64_dirs=""
+ - arm64_dirs="docker/core"
- script: sudo -E bash build.sh
env:
- repo="${DOCKER_USERNAME}"
- - x86_64_dirs="docker/core"
- - aarch64_dirs=""
+ - amd64_dirs="docker/core"
+ - arm64_dirs=""
- stage: publish functest-core manifests
script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-core:x86_64-euphrates \
- --template ${DOCKER_USERNAME}/functest-core:aarch64-euphrates \
+ --template ${DOCKER_USERNAME}/functest-core:ARCH-euphrates \
--target ${DOCKER_USERNAME}/functest-core:euphrates
- stage: build all functest images
script: sudo -E bash build.sh
env:
- repo="${DOCKER_USERNAME}"
- - x86_64_dirs=""
- - aarch64_dirs="docker/healthcheck"
+ - amd64_dirs=""
+ - arm64_dirs="docker/healthcheck"
- script: sudo -E bash build.sh
env:
- repo="${DOCKER_USERNAME}"
- - x86_64_dirs=""
- - aarch64_dirs="docker/smoke"
+ - amd64_dirs=""
+ - arm64_dirs="docker/smoke"
- script: sudo -E bash build.sh
env:
- repo="${DOCKER_USERNAME}"
- - x86_64_dirs=""
- - aarch64_dirs="docker/features"
+ - amd64_dirs=""
+ - arm64_dirs="docker/features"
- script: sudo -E bash build.sh
env:
- repo="${DOCKER_USERNAME}"
- - x86_64_dirs=""
- - aarch64_dirs="docker/components"
+ - amd64_dirs=""
+ - arm64_dirs="docker/components"
- script: sudo -E bash build.sh
env:
- repo="${DOCKER_USERNAME}"
- - x86_64_dirs="docker/healthcheck"
- - aarch64_dirs=""
+ - amd64_dirs="docker/healthcheck"
+ - arm64_dirs=""
- script: sudo -E bash build.sh
env:
- repo="${DOCKER_USERNAME}"
- - x86_64_dirs="docker/smoke"
- - aarch64_dirs=""
+ - amd64_dirs="docker/smoke"
+ - arm64_dirs=""
- script: sudo -E bash build.sh
env:
- repo="${DOCKER_USERNAME}"
- - x86_64_dirs="docker/features"
- - aarch64_dirs=""
+ - amd64_dirs="docker/features"
+ - arm64_dirs=""
- script: sudo -E bash build.sh
env:
- repo="${DOCKER_USERNAME}"
- - x86_64_dirs="docker/components"
- - aarch64_dirs=""
+ - amd64_dirs="docker/components"
+ - arm64_dirs=""
- script: sudo -E bash build.sh
env:
- repo="${DOCKER_USERNAME}"
- - x86_64_dirs="docker/vnf"
- - aarch64_dirs=""
+ - amd64_dirs="docker/vnf"
+ - arm64_dirs=""
- script: sudo -E bash build.sh
env:
- repo="${DOCKER_USERNAME}"
- - x86_64_dirs="docker/restapi"
- - aarch64_dirs=""
+ - amd64_dirs="docker/restapi"
+ - arm64_dirs=""
- script: sudo -E bash build.sh
env:
- repo="${DOCKER_USERNAME}"
- - x86_64_dirs="docker/parser"
- - aarch64_dirs=""
+ - amd64_dirs="docker/parser"
+ - arm64_dirs=""
- stage: publish all manifests
script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-healthcheck:x86_64-euphrates \
- --template ${DOCKER_USERNAME}/functest-healthcheck:aarch64-euphrates \
+ --template ${DOCKER_USERNAME}/functest-healthcheck:ARCH-euphrates \
--target ${DOCKER_USERNAME}/functest-healthcheck:euphrates
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-healthcheck:x86_64-euphrates \
- --template ${DOCKER_USERNAME}/functest-healthcheck:aarch64-euphrates \
+ --template ${DOCKER_USERNAME}/functest-healthcheck:ARCH-euphrates \
--target ${DOCKER_USERNAME}/functest-healthcheck:euphrates
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-smoke:x86_64-euphrates \
- --template ${DOCKER_USERNAME}/functest-smoke:aarch64-euphrates \
+ --template ${DOCKER_USERNAME}/functest-smoke:ARCH-euphrates \
--target ${DOCKER_USERNAME}/functest-smoke:euphrates
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-features:x86_64-euphrates \
- --template ${DOCKER_USERNAME}/functest-features:aarch64-euphrates \
+ --template ${DOCKER_USERNAME}/functest-features:ARCH-euphrates \
--target ${DOCKER_USERNAME}/functest-features:euphrates
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-components:x86_64-euphrates \
- --template ${DOCKER_USERNAME}/functest-components:aarch64-euphrates \
+ --template ${DOCKER_USERNAME}/functest-components:ARCH-euphrates \
--target ${DOCKER_USERNAME}/functest-components:euphrates
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64 \
- --template ${DOCKER_USERNAME}/functest-vnf:x86_64-euphrates \
+ --template ${DOCKER_USERNAME}/functest-vnf:ARCH-euphrates \
--target ${DOCKER_USERNAME}/functest-vnf:euphrates
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64 \
- --template ${DOCKER_USERNAME}/functest-restapi:x86_64-euphrates \
+ --template ${DOCKER_USERNAME}/functest-restapi:ARCH-euphrates \
--target ${DOCKER_USERNAME}/functest-restapi:euphrates
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64 \
- --template ${DOCKER_USERNAME}/functest-parser:x86_64-euphrates \
+ --template ${DOCKER_USERNAME}/functest-parser:ARCH-euphrates \
--target ${DOCKER_USERNAME}/functest-parser:euphrates
diff --git a/build.sh b/build.sh
index c70ca0cf8..87776f4cc 100644
--- a/build.sh
+++ b/build.sh
@@ -3,7 +3,7 @@
set -e
repo=${repo:-opnfv}
-x86_64_dirs=${x86_64_dirs-"\
+amd64_dirs=${amd64_dirs-"\
docker/core \
docker/healthcheck \
docker/smoke \
@@ -12,21 +12,21 @@ docker/components \
docker/vnf \
docker/parser \
docker/restapi"}
-aarch64_dirs=${aarch64_dirs-$(echo "${x86_64_dirs}" | sed -e "s|docker/vnf||" \
+arm64_dirs=${arm64_dirs-$(echo "${amd64_dirs}" | sed -e "s|docker/vnf||" \
-e "s|docker/restapi||")}
-find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core:euphrates|${repo}/functest-core:x86_64-euphrates|g" {} +
-for dir in ${x86_64_dirs}; do
- (cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:x86_64-euphrates" .)
- docker push "${repo}/functest-${dir##**/}:x86_64-euphrates"
+find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core:euphrates|${repo}/functest-core:amd64-euphrates|g" {} +
+for dir in ${amd64_dirs}; do
+ (cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:amd64-euphrates" .)
+ docker push "${repo}/functest-${dir##**/}:amd64-euphrates"
done
find . -name Dockerfile -exec git checkout {} +
-find . -name Dockerfile -exec sed -i -e "s|alpine:3.6|multiarch/alpine:aarch64-v3.6|g" {} +
-find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core:euphrates|${repo}/functest-core:aarch64-euphrates|g" {} +
-for dir in ${aarch64_dirs}; do
- (cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:aarch64-euphrates" .)
- docker push "${repo}/functest-${dir##**/}:aarch64-euphrates"
+find . -name Dockerfile -exec sed -i -e "s|alpine:3.6|multiarch/alpine:arm64-v3.6|g" {} +
+find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core:euphrates|${repo}/functest-core:arm64-euphrates|g" {} +
+for dir in ${arm64_dirs}; do
+ (cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:arm64-euphrates" .)
+ docker push "${repo}/functest-${dir##**/}:arm64-euphrates"
done
find . -name Dockerfile -exec git checkout {} +