diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-10-04 12:17:29 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-10-04 12:17:29 +0200 |
| commit | 1a70021a9fc7ab78b6695d2ebd7e6d12da1bc6b6 (patch) | |
| tree | 9a6a4fbc6aa290c12dee4de19a6a0394d75da07b | |
| parent | d78004d26591a8e6a6c2028265cdef9100ad4a01 (diff) | |
Prepare Xtesting Leguer containers
Change-Id: I4c7b01c5502b426f52e8492a5c322f0659900b0b
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | ansible/site.yml | 3 | ||||
| -rw-r--r-- | build.sh | 8 | ||||
| -rw-r--r-- | docker/mts/Dockerfile | 2 |
4 files changed, 12 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 60eb112c..089a1292 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,8 +50,8 @@ jobs: script: > sudo manifest-tool push from-args \ --platforms linux/amd64,linux/arm,linux/arm64 \ - --template ${DOCKER_USERNAME}/xtesting:ARCH-latest \ - --target ${DOCKER_USERNAME}/xtesting:latest + --template ${DOCKER_USERNAME}/xtesting:ARCH-leguer \ + --target ${DOCKER_USERNAME}/xtesting:leguer - stage: build xtesting-mts images script: sudo -E bash build.sh env: @@ -71,5 +71,5 @@ jobs: script: > sudo manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${DOCKER_USERNAME}/xtesting-mts:ARCH-latest \ - --target ${DOCKER_USERNAME}/xtesting-mts:latest + --template ${DOCKER_USERNAME}/xtesting-mts:ARCH-leguer \ + --target ${DOCKER_USERNAME}/xtesting-mts:leguer diff --git a/ansible/site.yml b/ansible/site.yml index 3f49628e..c93949c1 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -2,6 +2,9 @@ - hosts: 127.0.0.1 roles: - role: collivier.xtesting + docker_tags: + - leguer: + branch: stable/leguer builds: dependencies: - repo: _ @@ -17,7 +17,7 @@ docker/core \ docker/mts"} arm_dirs=${arm_dirs-${amd64_dirs}} arm64_dirs=${arm64_dirs-${amd64_dirs}} -tag=${BRANCH:-latest} +tag=${BRANCH:-leguer} image="xtesting" build_opts=(--pull=true --no-cache --force-rm=true) @@ -26,15 +26,15 @@ for arch in ${arch}; do find . -name Dockerfile -exec sed -i \ -e "s|alpine:3.12|arm64v8/alpine:3.12|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/xtesting|${repo}/xtesting:arm64-${tag}|g" {} + + -e "s|opnfv/xtesting:${tag}|${repo}/xtesting:arm64-${tag}|g" {} + elif [[ ${arch} == arm ]]; then find . -name Dockerfile -exec sed -i \ -e "s|alpine:3.12|arm32v6/alpine:3.12|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/xtesting|${repo}/xtesting:arm-${tag}|g" {} + + -e "s|opnfv/xtesting:${tag}|${repo}/xtesting:arm-${tag}|g" {} + else find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/xtesting|${repo}/xtesting:amd64-${tag}|g" {} + + -e "s|opnfv/xtesting:${tag}|${repo}/xtesting:amd64-${tag}|g" {} + fi dirs=${arch}_dirs for dir in ${!dirs}; do diff --git a/docker/mts/Dockerfile b/docker/mts/Dockerfile index 597e4f4b..6607ad6c 100644 --- a/docker/mts/Dockerfile +++ b/docker/mts/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/xtesting +FROM opnfv/xtesting:leguer ARG MTS_TAG=6.6.3 ARG APP_FOLDER=/opt/mts |