aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml24
-rw-r--r--ansible/site.cntt.yml3
-rw-r--r--ansible/site.yml3
-rw-r--r--build.sh56
-rw-r--r--docker/benchmarking/Dockerfile2
-rw-r--r--docker/cnf/Dockerfile2
-rw-r--r--docker/healthcheck/Dockerfile2
-rw-r--r--docker/security/Dockerfile2
-rw-r--r--docker/smoke/Dockerfile2
9 files changed, 51 insertions, 45 deletions
diff --git a/.travis.yml b/.travis.yml
index 46664fb8..6aa95596 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,8 +46,8 @@ jobs:
script: >
manifest-tool push from-args \
--platforms linux/amd64,linux/arm,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-kubernetes-core:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-kubernetes-core:latest
+ --template ${DOCKER_USERNAME}/functest-kubernetes-core:ARCH-leguer \
+ --target ${DOCKER_USERNAME}/functest-kubernetes-core:leguer
- stage: build functest-kubernetes-[healthcheck,cnf,security] images
script: bash build.sh
env:
@@ -108,19 +108,19 @@ jobs:
manifest-tool push from-args \
--platforms linux/amd64,linux/arm,linux/arm64 \
--template \
- ${DOCKER_USERNAME}/functest-kubernetes-healthcheck:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-kubernetes-healthcheck:latest
+ ${DOCKER_USERNAME}/functest-kubernetes-healthcheck:ARCH-leguer \
+ --target ${DOCKER_USERNAME}/functest-kubernetes-healthcheck:leguer
- script: >
manifest-tool push from-args \
--platforms linux/amd64,linux/arm,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-kubernetes-cnf:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-kubernetes-cnf:latest
+ --template ${DOCKER_USERNAME}/functest-kubernetes-cnf:ARCH-leguer \
+ --target ${DOCKER_USERNAME}/functest-kubernetes-cnf:leguer
- script: >
manifest-tool push from-args \
--platforms linux/amd64,linux/arm,linux/arm64 \
--template \
- ${DOCKER_USERNAME}/functest-kubernetes-security:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-kubernetes-security:latest
+ ${DOCKER_USERNAME}/functest-kubernetes-security:ARCH-leguer \
+ --target ${DOCKER_USERNAME}/functest-kubernetes-security:leguer
- stage: build functest-kubernetes-smoke image
script: bash build.sh
env:
@@ -144,8 +144,8 @@ jobs:
script: >
manifest-tool push from-args \
--platforms linux/amd64,linux/arm,linux/arm64 \
- --template ${DOCKER_USERNAME}/functest-kubernetes-smoke:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-kubernetes-smoke:latest
+ --template ${DOCKER_USERNAME}/functest-kubernetes-smoke:ARCH-leguer \
+ --target ${DOCKER_USERNAME}/functest-kubernetes-smoke:leguer
- stage: build functest-kubernetes-benchmarking image
script: bash build.sh
env:
@@ -170,5 +170,5 @@ jobs:
manifest-tool push from-args \
--platforms linux/amd64,linux/arm,linux/arm64 \
--template \
- ${DOCKER_USERNAME}/functest-kubernetes-benchmarking:ARCH-latest \
- --target ${DOCKER_USERNAME}/functest-kubernetes-benchmarking:latest
+ ${DOCKER_USERNAME}/functest-kubernetes-benchmarking:ARCH-leguer \
+ --target ${DOCKER_USERNAME}/functest-kubernetes-benchmarking:leguer
diff --git a/ansible/site.cntt.yml b/ansible/site.cntt.yml
index f86a392f..6c193a11 100644
--- a/ansible/site.cntt.yml
+++ b/ansible/site.cntt.yml
@@ -4,6 +4,9 @@
- role: collivier.xtesting
project: functest-kubernetes
db_project: functest
+ docker_tags:
+ - leguer:
+ branch: stable/leguer
suites:
- container: functest-kubernetes-healthcheck
tests:
diff --git a/ansible/site.yml b/ansible/site.yml
index bfe330f4..977abc4c 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -5,6 +5,9 @@
project: functest-kubernetes
db_project: functest
gerrit_project: functest-kubernetes
+ docker_tags:
+ - leguer:
+ branch: stable/leguer
builds:
dependencies:
- repo: _
diff --git a/build.sh b/build.sh
index fbd5001e..2601f022 100644
--- a/build.sh
+++ b/build.sh
@@ -15,71 +15,71 @@ 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-kubernetes-core|\
-${repo}/functest-kubernetes-core:amd64-latest|g" {} +
+ -e "s|opnfv/functest-kubernetes-core:leguer|\
+${repo}/functest-kubernetes-core:amd64-leguer|g" {} +
find . -name Dockerfile -exec sed -i \
- -e "s|opnfv/functest-kubernetes-healthcheck|\
-${repo}/functest-kubernetes-healthcheck:amd64-latest|g" {} +
+ -e "s|opnfv/functest-kubernetes-healthcheck:leguer|\
+${repo}/functest-kubernetes-healthcheck:amd64-leguer|g" {} +
for dir in ${amd64_dirs}; do
(cd "${dir}" &&
docker build "${build_opts[@]}" \
- -t "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" .)
- docker push "${repo}/functest-kubernetes-${dir##**/}:amd64-latest"
+ -t "${repo}/functest-kubernetes-${dir##**/}:amd64-leguer" .)
+ docker push "${repo}/functest-kubernetes-${dir##**/}:amd64-leguer"
[ "${dir}" != "docker/core" ] &&
(docker rmi \
- "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" || true)
+ "${repo}/functest-kubernetes-${dir##**/}:amd64-leguer" || true)
done
[ ! -z "${amd64_dirs}" ] &&
(docker rmi \
- "${repo}/functest-kubernetes-core:amd64-latest" \
+ "${repo}/functest-kubernetes-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-kubernetes-core|\
-${repo}/functest-kubernetes-core:arm64-latest|g" {} +
+ -e "s|opnfv/functest-kubernetes-core:leguer|\
+${repo}/functest-kubernetes-core:arm64-leguer|g" {} +
find . -name Dockerfile -exec sed -i \
- -e "s|opnfv/functest-kubernetes-healthcheck|\
-${repo}/functest-kubernetes-healthcheck:arm64-latest|g" {} +
+ -e "s|opnfv/functest-kubernetes-healthcheck:leguer|\
+${repo}/functest-kubernetes-healthcheck:arm64-leguer|g" {} +
find . -name Dockerfile -exec sed -i \
- -e "s|opnfv/functest-kubernetes-smoke|\
-${repo}/functest-kubernetes-smoke:arm64-latest|g" {} +
+ -e "s|opnfv/functest-kubernetes-smoke:leguer|\
+${repo}/functest-kubernetes-smoke:arm64-leguer|g" {} +
for dir in ${arm64_dirs}; do
(cd "${dir}" && docker build "${build_opts[@]}" \
- -t "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" .)
- docker push "${repo}/functest-kubernetes-${dir##**/}:arm64-latest"
+ -t "${repo}/functest-kubernetes-${dir##**/}:arm64-leguer" .)
+ docker push "${repo}/functest-kubernetes-${dir##**/}:arm64-leguer"
[ "${dir}" != "docker/core" ] &&
(docker rmi \
- "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" || true)
+ "${repo}/functest-kubernetes-${dir##**/}:arm64-leguer" || true)
done
[ ! -z "${arm64_dirs}" ] &&
- (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \
+ (docker rmi "${repo}/functest-kubernetes-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|arm32v7/alpine:3.12|g" {} +
find . -name Dockerfile -exec sed -i \
- -e "s|opnfv/functest-kubernetes-core|\
-${repo}/functest-kubernetes-core:arm-latest|g" {} +
+ -e "s|opnfv/functest-kubernetes-core:leguer|\
+${repo}/functest-kubernetes-core:arm-leguer|g" {} +
find . -name Dockerfile -exec sed -i \
- -e "s|opnfv/functest-kubernetes-healthcheck|\
-${repo}/functest-kubernetes-healthcheck:arm-latest|g" {} +
+ -e "s|opnfv/functest-kubernetes-healthcheck:leguer|\
+${repo}/functest-kubernetes-healthcheck:arm-leguer|g" {} +
find . -name Dockerfile -exec sed -i \
- -e "s|opnfv/functest-kubernetes-smoke|\
-${repo}/functest-kubernetes-smoke:arm-latest|g" {} +
+ -e "s|opnfv/functest-kubernetes-smoke:leguer|\
+${repo}/functest-kubernetes-smoke:arm-leguer|g" {} +
for dir in ${arm_dirs}; do
(cd "${dir}" && docker build "${build_opts[@]}" \
- -t "${repo}/functest-kubernetes-${dir##**/}:arm-latest" .)
- docker push "${repo}/functest-kubernetes-${dir##**/}:arm-latest"
+ -t "${repo}/functest-kubernetes-${dir##**/}:arm-leguer" .)
+ docker push "${repo}/functest-kubernetes-${dir##**/}:arm-leguer"
[ "${dir}" != "docker/core" ] &&
(docker rmi \
- "${repo}/functest-kubernetes-${dir##**/}:arm-latest" || true)
+ "${repo}/functest-kubernetes-${dir##**/}:arm-leguer" || true)
done
[ ! -z "${arm_dirs}" ] &&
- (docker rmi "${repo}/functest-kubernetes-core:arm-latest" \
+ (docker rmi "${repo}/functest-kubernetes-core:arm-leguer" \
arm32v7/alpine:3.12 || true)
find . -name Dockerfile -exec git checkout {} +
diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile
index 6625322c..a8b74b82 100644
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-smoke
+FROM opnfv/functest-kubernetes-smoke:leguer
COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml
CMD ["run_tests", "-t", "all"]
diff --git a/docker/cnf/Dockerfile b/docker/cnf/Dockerfile
index 6f1a5e65..4b8eaf2a 100644
--- a/docker/cnf/Dockerfile
+++ b/docker/cnf/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:leguer
ARG CNF_CONFORMANCE_TAG=v0.7.2-beta1
ARG HELM_TAG=v3.3.1
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index a28cf35d..e399ed22 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:leguer
RUN apk --no-cache add --update curl libc6-compat && \
K8S_TAG=$(curl -s https://storage.googleapis.com/kubernetes-release/release/latest-1.19.txt) && \
diff --git a/docker/security/Dockerfile b/docker/security/Dockerfile
index 915ebd65..fd8866c9 100644
--- a/docker/security/Dockerfile
+++ b/docker/security/Dockerfile
@@ -1,3 +1,3 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:leguer
COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 72ad2e6e..e1292c4a 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-healthcheck
+FROM opnfv/functest-kubernetes-healthcheck:leguer
COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml
CMD ["run_tests", "-t", "all"]