diff options
| -rw-r--r-- | .travis.yml | 88 | ||||
| -rw-r--r-- | build.sh | 25 |
2 files changed, 108 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index cc7d0eb2d..7effccace 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,10 +26,23 @@ jobs: - REPO="${DOCKER_USERNAME}" - amd64_dirs="docker/core" - arm64_dirs="" + - arm_dirs="" + - script: sudo -E bash build.sh + env: + - REPO="${DOCKER_USERNAME}" + - amd64_dirs="" + - arm64_dirs="docker/core" + - arm_dirs="" + - script: sudo -E bash build.sh + env: + - REPO="${DOCKER_USERNAME}" + - amd64_dirs="" + - arm64_dirs="" + - arm_dirs="docker/core" - stage: publish functest-core manifests script: > sudo manifest-tool push from-args \ - --platforms linux/amd64 \ + --platforms linux/amd64,linux/arm,linux/arm64 \ --template ${DOCKER_USERNAME}/functest-core:ARCH-hunter \ --target ${DOCKER_USERNAME}/functest-core:hunter - stage: build functest-tempest images @@ -38,10 +51,23 @@ jobs: - REPO="${DOCKER_USERNAME}" - amd64_dirs="docker/tempest" - arm64_dirs="" + - arm_dirs="" + - script: sudo -E bash build.sh + env: + - REPO="${DOCKER_USERNAME}" + - amd64_dirs="" + - arm64_dirs="docker/tempest" + - arm_dirs="" + - script: sudo -E bash build.sh + env: + - REPO="${DOCKER_USERNAME}" + - amd64_dirs="" + - arm64_dirs="" + - arm_dirs="docker/tempest" - stage: publish functest-tempest manifests script: > sudo manifest-tool push from-args \ - --platforms linux/amd64 \ + --platforms linux/amd64,linux/arm,linux/arm64 \ --template ${DOCKER_USERNAME}/functest-tempest:ARCH-hunter \ --target ${DOCKER_USERNAME}/functest-tempest:hunter - stage: build all functest images @@ -50,40 +76,92 @@ jobs: - REPO="${DOCKER_USERNAME}" - amd64_dirs="docker/healthcheck" - arm64_dirs="" + - arm_dirs="" + - script: sudo -E bash build.sh + env: + - REPO="${DOCKER_USERNAME}" + - amd64_dirs="" + - arm64_dirs="docker/healthcheck" + - arm_dirs="" + - script: sudo -E bash build.sh + env: + - REPO="${DOCKER_USERNAME}" + - amd64_dirs="" + - arm64_dirs="" + - arm_dirs="docker/healthcheck" - script: sudo -E bash build.sh env: - REPO="${DOCKER_USERNAME}" - amd64_dirs="docker/smoke" - arm64_dirs="" + - arm_dirs="" + - script: sudo -E bash build.sh + env: + - REPO="${DOCKER_USERNAME}" + - amd64_dirs="" + - arm64_dirs="docker/smoke" + - arm_dirs="" + - script: sudo -E bash build.sh + env: + - REPO="${DOCKER_USERNAME}" + - amd64_dirs="" + - arm64_dirs="" + - arm_dirs="docker/smoke" - script: sudo -E bash build.sh env: - REPO="${DOCKER_USERNAME}" - amd64_dirs="docker/benchmarking" - arm64_dirs="" + - arm_dirs="" + - script: sudo -E bash build.sh + env: + - REPO="${DOCKER_USERNAME}" + - amd64_dirs="" + - arm64_dirs="" + - arm_dirs="docker/benchmarking" - script: sudo -E bash build.sh env: - REPO="${DOCKER_USERNAME}" - amd64_dirs="docker/features" - arm64_dirs="" + - arm_dirs="" + - script: sudo -E bash build.sh + env: + - REPO="${DOCKER_USERNAME}" + - amd64_dirs="" + - arm64_dirs="docker/features" + - arm_dirs="" + - script: sudo -E bash build.sh + env: + - REPO="${DOCKER_USERNAME}" + - amd64_dirs="" + - arm64_dirs="" + - arm_dirs="docker/features" - script: sudo -E bash build.sh env: - REPO="${DOCKER_USERNAME}" - amd64_dirs="docker/vnf" - arm64_dirs="" + - arm_dirs="" - stage: publish all manifests script: > sudo manifest-tool push from-args \ - --platforms linux/amd64 \ + --platforms linux/amd64,linux/arm,linux/arm64 \ --template ${DOCKER_USERNAME}/functest-healthcheck:ARCH-hunter \ --target ${DOCKER_USERNAME}/functest-healthcheck:hunter - script: > sudo manifest-tool push from-args \ - --platforms linux/amd64 \ + --platforms linux/amd64,linux/arm,linux/arm64 \ --template ${DOCKER_USERNAME}/functest-smoke:ARCH-hunter \ --target ${DOCKER_USERNAME}/functest-smoke:hunter - script: > sudo manifest-tool push from-args \ - --platforms linux/amd64 \ + --platforms linux/amd64,linux/arm \ + --template ${DOCKER_USERNAME}/functest-benchmarking:ARCH-hunter \ + --target ${DOCKER_USERNAME}/functest-benchmarking:hunter + - script: > + sudo manifest-tool push from-args \ + --platforms linux/amd64,linux/arm,linux/arm64 \ --template ${DOCKER_USERNAME}/functest-features:ARCH-hunter \ --target ${DOCKER_USERNAME}/functest-features:hunter - script: > @@ -11,6 +11,13 @@ docker/smoke \ docker/benchmarking \ docker/features \ docker/vnf"} +arm_dirs=${arm_dirs-"\ +docker/core \ +docker/tempest \ +docker/healthcheck \ +docker/smoke \ +docker/benchmarking \ +docker/features"} arm64_dirs=${arm64_dirs-${amd64_dirs}} build_opts=(--pull=true --no-cache --force-rm=true) @@ -48,4 +55,22 @@ done multiarch/alpine:arm64-v3.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" {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-core:hunter|${repo}/functest-core:arm-hunter|g" {} + +find . -name Dockerfile -exec sed -i \ + -e "s|opnfv/functest-tempest:hunter|${repo}/functest-tempest:arm-hunter|g" {} + +for dir in ${arm_dirs}; do + (cd "${dir}" && docker build "${build_opts[@]}" \ + -t "${repo}/functest-${dir##**/}:arm-hunter" .) + docker push "${repo}/functest-${dir##**/}:arm-hunter" + [ "${dir}" != "docker/core" ] && + (docker rmi "${repo}/functest-${dir##**/}:arm-hunter" || true) +done +[ ! -z "${arm_dirs}" ] && + (docker rmi "${repo}/functest-core:arm-hunter" \ + multiarch/alpine:armhf-v3.9 || true) +find . -name Dockerfile -exec git checkout {} + + exit $? |