aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml28
-rw-r--r--ansible/site.cntt.yml3
-rw-r--r--ansible/site.yml3
-rw-r--r--build.sh42
-rw-r--r--docker/benchmarking-cntt/Dockerfile2
-rw-r--r--docker/benchmarking/Dockerfile2
-rw-r--r--docker/healthcheck/Dockerfile2
-rw-r--r--docker/smoke-cntt/Dockerfile2
-rw-r--r--docker/smoke/Dockerfile2
-rw-r--r--docker/vnf/Dockerfile2
10 files changed, 50 insertions, 38 deletions
diff --git a/.travis.yml b/.travis.yml
index 943290ab4..f21e09941 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,8 +48,8 @@ jobs:
script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-core:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-core:latest
+ --template ${DOCKER_USERNAME}/functest-core:ARCH-leguer \
+ --target ${DOCKER_USERNAME}/functest-core:leguer
- stage: build all functest images
script: sudo -E bash build.sh
env:
@@ -127,23 +127,23 @@ jobs:
script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-healthcheck:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-healthcheck:latest
+ --template ${DOCKER_USERNAME}/functest-healthcheck:ARCH-leguer \
+ --target ${DOCKER_USERNAME}/functest-healthcheck:leguer
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-smoke:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-smoke:latest
+ --template ${DOCKER_USERNAME}/functest-smoke:ARCH-leguer \
+ --target ${DOCKER_USERNAME}/functest-smoke:leguer
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-benchmarking:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-benchmarking:latest
+ --template ${DOCKER_USERNAME}/functest-benchmarking:ARCH-leguer \
+ --target ${DOCKER_USERNAME}/functest-benchmarking:leguer
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-vnf:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-vnf:latest
+ --template ${DOCKER_USERNAME}/functest-vnf:ARCH-leguer \
+ --target ${DOCKER_USERNAME}/functest-vnf:leguer
- stage: build all functest cntt images
script: sudo -E bash build.sh
env:
@@ -185,10 +185,10 @@ jobs:
script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-smoke-cntt:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-smoke-cntt:latest
+ --template ${DOCKER_USERNAME}/functest-smoke-cntt:ARCH-leguer \
+ --target ${DOCKER_USERNAME}/functest-smoke-cntt:leguer
- script: >
sudo manifest-tool push from-args \
--platforms linux/amd64,linux/arm,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-benchmarking-cntt:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-benchmarking-cntt:latest
+ --template ${DOCKER_USERNAME}/functest-benchmarking-cntt:ARCH-leguer \
+ --target ${DOCKER_USERNAME}/functest-benchmarking-cntt:leguer
diff --git a/ansible/site.cntt.yml b/ansible/site.cntt.yml
index b0b51b1d6..9c10659d4 100644
--- a/ansible/site.cntt.yml
+++ b/ansible/site.cntt.yml
@@ -4,6 +4,9 @@
roles:
- role: collivier.xtesting
project: functest
+ docker_tags:
+ - leguer:
+ branch: stable/leguer
suites:
- container: functest-healthcheck
tests:
diff --git a/ansible/site.yml b/ansible/site.yml
index 2c8307972..ef7fb0b51 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -5,6 +5,9 @@
- role: collivier.xtesting
project: functest
gerrit_project: functest
+ docker_tags:
+ - leguer:
+ branch: stable/leguer
builds:
dependencies:
- repo: _
diff --git a/build.sh b/build.sh
index ab02bb2a5..bf4115ec6 100644
--- a/build.sh
+++ b/build.sh
@@ -16,54 +16,60 @@ arm64_dirs=${arm64_dirs-${amd64_dirs}}
build_opts=("--pull=true" --no-cache "--force-rm=true")
find . -name Dockerfile -exec sed -i \
- -e "s|opnfv/functest-core|${repo}/functest-core:amd64-latest|g" {} +
+ -e "s|opnfv/functest-core:leguer|${repo}/functest-core:amd64-leguer|g" {} +
find . -name Dockerfile -exec sed -i \
- -e "s|opnfv/functest-tempest|${repo}/functest-tempest:amd64-latest|g" {} +
+ -e \
+ "s|opnfv/functest-tempest:leguer|${repo}/functest-tempest:amd64-leguer|g" \
+ {} +
for dir in ${amd64_dirs}; do
(cd "${dir}" &&
docker build "${build_opts[@]}" \
- -t "${repo}/functest-${dir##**/}:amd64-latest" .)
- docker push "${repo}/functest-${dir##**/}:amd64-latest"
+ -t "${repo}/functest-${dir##**/}:amd64-leguer" .)
+ docker push "${repo}/functest-${dir##**/}:amd64-leguer"
[ "${dir}" != "docker/core" ] &&
- (docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true)
+ (docker rmi "${repo}/functest-${dir##**/}:amd64-leguer" || true)
done
[ -n "${amd64_dirs}" ] &&
- (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.12 || true)
+ (docker rmi "${repo}/functest-core:amd64-leguer" alpine:3.12 || true)
find . -name Dockerfile -exec git checkout {} +
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/functest-core|${repo}/functest-core:arm64-latest|g" {} +
+ -e "s|opnfv/functest-core:leguer|${repo}/functest-core:arm64-leguer|g" {} +
find . -name Dockerfile -exec sed -i \
- -e "s|opnfv/functest-tempest|${repo}/functest-tempest:arm64-latest|g" {} +
+ -e \
+ "s|opnfv/functest-tempest:leguer|${repo}/functest-tempest:arm64-leguer|g" \
+ {} +
for dir in ${arm64_dirs}; do
(cd "${dir}" && docker build "${build_opts[@]}" \
- -t "${repo}/functest-${dir##**/}:arm64-latest" .)
- docker push "${repo}/functest-${dir##**/}:arm64-latest"
+ -t "${repo}/functest-${dir##**/}:arm64-leguer" .)
+ docker push "${repo}/functest-${dir##**/}:arm64-leguer"
[ "${dir}" != "docker/core" ] &&
- (docker rmi "${repo}/functest-${dir##**/}:arm64-latest" || true)
+ (docker rmi "${repo}/functest-${dir##**/}:arm64-leguer" || true)
done
[ -n "${arm64_dirs}" ] &&
- (docker rmi "${repo}/functest-core:arm64-latest" \
+ (docker rmi "${repo}/functest-core:arm64-leguer" \
arm64v8/alpine:3.12 || true)
find . -name Dockerfile -exec git checkout {} +
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/functest-core|${repo}/functest-core:arm-latest|g" {} +
+ -e "s|opnfv/functest-core:leguer|${repo}/functest-core:arm-leguer|g" {} +
find . -name Dockerfile -exec sed -i \
- -e "s|opnfv/functest-tempest|${repo}/functest-tempest:arm-latest|g" {} +
+ -e \
+ "s|opnfv/functest-tempest:leguer|${repo}/functest-tempest:arm-leguer|g" \
+ {} +
for dir in ${arm_dirs}; do
(cd "${dir}" && docker build "${build_opts[@]}" \
- -t "${repo}/functest-${dir##**/}:arm-latest" .)
- docker push "${repo}/functest-${dir##**/}:arm-latest"
+ -t "${repo}/functest-${dir##**/}:arm-leguer" .)
+ docker push "${repo}/functest-${dir##**/}:arm-leguer"
[ "${dir}" != "docker/core" ] &&
- (docker rmi "${repo}/functest-${dir##**/}:arm-latest" || true)
+ (docker rmi "${repo}/functest-${dir##**/}:arm-leguer" || true)
done
[ -n "${arm_dirs}" ] &&
- (docker rmi "${repo}/functest-core:arm-latest" \
+ (docker rmi "${repo}/functest-core:arm-leguer" \
arm32v6/alpine:3.12 || true)
find . -name Dockerfile -exec git checkout {} +
diff --git a/docker/benchmarking-cntt/Dockerfile b/docker/benchmarking-cntt/Dockerfile
index 56b69e270..cb7203631 100644
--- a/docker/benchmarking-cntt/Dockerfile
+++ b/docker/benchmarking-cntt/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-benchmarking
+FROM opnfv/functest-benchmarking:leguer
COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml
COPY blacklist.yaml /src/functest/functest/opnfv_tests/openstack/rally/blacklist.yaml
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index a89dd0c95..401cea020 100644
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:leguer
ARG VMTP_TAG=master
ARG NEUTRON_TAG=master
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 4d55e93f9..f146d530f 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:leguer
ARG ODL_TAG=89b88a0a23561f0bda62338b394ec41655679b2d
ARG TEMPEST_HORIZON_TAG=master
diff --git a/docker/smoke-cntt/Dockerfile b/docker/smoke-cntt/Dockerfile
index 4585edb34..7fad36ea5 100644
--- a/docker/smoke-cntt/Dockerfile
+++ b/docker/smoke-cntt/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-smoke
+FROM opnfv/functest-smoke:leguer
COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml
COPY tempest_conf.yaml /src/functest/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 1eaaf2b11..294fa9b6a 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:leguer
ARG PATROLE_TAG=master
ARG NEUTRON_TEMPEST_TAG=master
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 4f989e222..a9ffd8b37 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:leguer
ARG VIMS_TEST_TAG=release-130
ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909