diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2017-10-13 10:38:38 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-10-13 10:50:18 +0200 |
| commit | fed72336e3b50b8441f233a2f122e482ee83ae8c (patch) | |
| tree | da1ba1c194136df029c1fd71066589943a567b86 /.travis.yml | |
| parent | 188f6330f4c941e0b582116f9161b7b82528e2a7 (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)
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 76 |
1 files changed, 35 insertions, 41 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 |