summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-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 af67f4786..f0bafbfce 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-latest \
- --template ${DOCKER_USERNAME}/functest-core:aarch64-latest \
+ --template ${DOCKER_USERNAME}/functest-core:ARCH-latest \
--target ${DOCKER_USERNAME}/functest-core:latest
- 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-latest \
- --template ${DOCKER_USERNAME}/functest-healthcheck:aarch64-latest \
+ --template ${DOCKER_USERNAME}/functest-healthcheck:ARCH-latest \
--target ${DOCKER_USERNAME}/functest-healthcheck:latest
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-healthcheck:x86_64-latest \
- --template ${DOCKER_USERNAME}/functest-healthcheck:aarch64-latest \
+ --template ${DOCKER_USERNAME}/functest-healthcheck:ARCH-latest \
--target ${DOCKER_USERNAME}/functest-healthcheck:latest
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-smoke:x86_64-latest \
- --template ${DOCKER_USERNAME}/functest-smoke:aarch64-latest \
+ --template ${DOCKER_USERNAME}/functest-smoke:ARCH-latest \
--target ${DOCKER_USERNAME}/functest-smoke:latest
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-features:x86_64-latest \
- --template ${DOCKER_USERNAME}/functest-features:aarch64-latest \
+ --template ${DOCKER_USERNAME}/functest-features:ARCH-latest \
--target ${DOCKER_USERNAME}/functest-features:latest
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-components:x86_64-latest \
- --template ${DOCKER_USERNAME}/functest-components:aarch64-latest \
+ --template ${DOCKER_USERNAME}/functest-components:ARCH-latest \
--target ${DOCKER_USERNAME}/functest-components:latest
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64 \
- --template ${DOCKER_USERNAME}/functest-vnf:x86_64-latest \
+ --template ${DOCKER_USERNAME}/functest-vnf:ARCH-latest \
--target ${DOCKER_USERNAME}/functest-vnf:latest
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64 \
- --template ${DOCKER_USERNAME}/functest-restapi:x86_64-latest \
+ --template ${DOCKER_USERNAME}/functest-restapi:ARCH-latest \
--target ${DOCKER_USERNAME}/functest-restapi:latest
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64 \
- --template ${DOCKER_USERNAME}/functest-parser:x86_64-latest \
+ --template ${DOCKER_USERNAME}/functest-parser:ARCH-latest \
--target ${DOCKER_USERNAME}/functest-parser:latest
diff --git a/build.sh b/build.sh
index 3b46cb06e..cadb3f6fb 100644
--- a/build.sh
+++ b/build.sh
@@ -3,7 +3,7 @@
set -e
repo=${repo:-opnfv}
-x86_64_dirs=${x86_64_dirs-"\
+amd64_dirs=${x86_64_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=${aarch64_dirs-$(echo "${amd64_dirs}" | sed -e "s|docker/vnf||" \
-e "s|docker/restapi||")}
-find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:x86_64-latest|g" {} +
-for dir in ${x86_64_dirs}; do
- (cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:x86_64-latest" .)
- docker push "${repo}/functest-${dir##**/}:x86_64-latest"
+find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core|${repo}/functest-core:amd64-latest|g" {} +
+for dir in ${amd64_dirs}; do
+ (cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:amd64-latest" .)
+ docker push "${repo}/functest-${dir##**/}:amd64-latest"
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|${repo}/functest-core:aarch64-latest|g" {} +
-for dir in ${aarch64_dirs}; do
- (cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:aarch64-latest" .)
- docker push "${repo}/functest-${dir##**/}:aarch64-latest"
+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|${repo}/functest-core:arm64-latest|g" {} +
+for dir in ${arm64_dirs}; do
+ (cd "${dir}" && docker build -t "${repo}/functest-${dir##**/}:arm64-latest" .)
+ docker push "${repo}/functest-${dir##**/}:arm64-latest"
done
find . -name Dockerfile -exec git checkout {} +