aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.travis.yml28
-rw-r--r--build.sh56
-rw-r--r--docker/benchmarking-cntt/Dockerfile2
-rw-r--r--docker/benchmarking/Dockerfile4
-rw-r--r--docker/core/Dockerfile4
-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
-rw-r--r--tox.ini2
10 files changed, 52 insertions, 52 deletions
diff --git a/.travis.yml b/.travis.yml
index ba6310af5..196dd95c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,8 +42,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-yoga \
+ --target ${DOCKER_USERNAME}/functest-core:yoga
- stage: build all functest images
script: sudo -E bash build.sh
env:
@@ -121,23 +121,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-yoga \
+ --target ${DOCKER_USERNAME}/functest-healthcheck:yoga
- 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-yoga \
+ --target ${DOCKER_USERNAME}/functest-smoke:yoga
- 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-yoga \
+ --target ${DOCKER_USERNAME}/functest-benchmarking:yoga
- 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-yoga \
+ --target ${DOCKER_USERNAME}/functest-vnf:yoga
- stage: build all functest cntt images
script: sudo -E bash build.sh
env:
@@ -179,10 +179,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-yoga \
+ --target ${DOCKER_USERNAME}/functest-smoke-cntt:yoga
- 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-yoga \
+ --target ${DOCKER_USERNAME}/functest-benchmarking-cntt:yoga
diff --git a/build.sh b/build.sh
index effd07500..73b98b2b7 100644
--- a/build.sh
+++ b/build.sh
@@ -16,64 +16,64 @@ 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:yoga|${repo}/functest-core:amd64-yoga|g" {} +
find . -name Dockerfile -exec sed -i \
- -e "s|opnfv/functest-smoke|${repo}/functest-smoke:amd64-latest|g" {} +
+ -e "s|opnfv/functest-smoke:yoga|${repo}/functest-smoke:amd64-yoga|g" {} +
find . -name Dockerfile -exec sed -i \
- -e "s|opnfv/functest-benchmarking|\
-${repo}/functest-benchmarking:amd64-latest|g" {} +
+ -e "s|opnfv/functest-benchmarking:yoga|\
+${repo}/functest-benchmarking:amd64-yoga|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-yoga" .)
+ docker push "${repo}/functest-${dir##**/}:amd64-yoga"
[ "${dir}" != "docker/core" ] &&
- (docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true)
+ (docker rmi "${repo}/functest-${dir##**/}:amd64-yoga" || true)
done
[ -n "${amd64_dirs}" ] &&
- (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.13 || true)
+ (docker rmi "${repo}/functest-core:amd64-yoga" alpine:3.14 || true)
find . -name Dockerfile -exec git checkout {} +
find . -name Dockerfile -exec sed -i \
- -e "s|alpine:3.13|arm64v8/alpine:3.13|g" {} +
+ -e "s|alpine:3.14|arm64v8/alpine:3.14|g" {} +
find . -name Dockerfile -exec sed -i \
- -e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} +
+ -e "s|opnfv/functest-core:yoga|${repo}/functest-core:arm64-yoga|g" {} +
find . -name Dockerfile -exec sed -i \
- -e "s|opnfv/functest-smoke|${repo}/functest-smoke:arm64-latest|g" {} +
+ -e "s|opnfv/functest-smoke:yoga|${repo}/functest-smoke:arm64-yoga|g" {} +
find . -name Dockerfile -exec sed -i \
- -e "s|opnfv/functest-benchmarking|\
-${repo}/functest-benchmarking:arm64-latest|g" {} +
+ -e "s|opnfv/functest-benchmarking:yoga|\
+${repo}/functest-benchmarking:arm64-yoga|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-yoga" .)
+ docker push "${repo}/functest-${dir##**/}:arm64-yoga"
[ "${dir}" != "docker/core" ] &&
- (docker rmi "${repo}/functest-${dir##**/}:arm64-latest" || true)
+ (docker rmi "${repo}/functest-${dir##**/}:arm64-yoga" || true)
done
[ -n "${arm64_dirs}" ] &&
- (docker rmi "${repo}/functest-core:arm64-latest" \
- arm64v8/alpine:3.13 || true)
+ (docker rmi "${repo}/functest-core:arm64-yoga" \
+ arm64v8/alpine:3.14 || true)
find . -name Dockerfile -exec git checkout {} +
find . -name Dockerfile -exec sed -i \
- -e "s|alpine:3.13|arm32v6/alpine:3.13|g" {} +
+ -e "s|alpine:3.14|arm32v6/alpine:3.14|g" {} +
find . -name Dockerfile -exec sed -i \
- -e "s|opnfv/functest-core|${repo}/functest-core:arm-latest|g" {} +
+ -e "s|opnfv/functest-core:yoga|${repo}/functest-core:arm-yoga|g" {} +
find . -name Dockerfile -exec sed -i \
- -e "s|opnfv/functest-smoke|${repo}/functest-smoke:arm-latest|g" {} +
+ -e "s|opnfv/functest-smoke:yoga|${repo}/functest-smoke:arm-yoga|g" {} +
find . -name Dockerfile -exec sed -i \
- -e "s|opnfv/functest-benchmarking|\
-${repo}/functest-benchmarking:arm-latest|g" {} +
+ -e "s|opnfv/functest-benchmarking:yoga|\
+${repo}/functest-benchmarking:arm-yoga|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-yoga" .)
+ docker push "${repo}/functest-${dir##**/}:arm-yoga"
[ "${dir}" != "docker/core" ] &&
- (docker rmi "${repo}/functest-${dir##**/}:arm-latest" || true)
+ (docker rmi "${repo}/functest-${dir##**/}:arm-yoga" || true)
done
[ -n "${arm_dirs}" ] &&
- (docker rmi "${repo}/functest-core:arm-latest" \
- arm32v6/alpine:3.13 || true)
+ (docker rmi "${repo}/functest-core:arm-yoga" \
+ arm32v6/alpine:3.14 || true)
find . -name Dockerfile -exec git checkout {} +
exit $?
diff --git a/docker/benchmarking-cntt/Dockerfile b/docker/benchmarking-cntt/Dockerfile
index 46acaa036..74ebd6027 100644
--- a/docker/benchmarking-cntt/Dockerfile
+++ b/docker/benchmarking-cntt/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-benchmarking
+FROM opnfv/functest-benchmarking:yoga
COPY testcases.yaml /etc/xtesting/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 d0957f6b8..9712ef117 100644
--- a/docker/benchmarking/Dockerfile
+++ b/docker/benchmarking/Dockerfile
@@ -1,7 +1,7 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:yoga
ARG VMTP_TAG=34a82c9f3598ec7f5d8de0a6d5139b92931db4cc
-ARG NEUTRON_TAG=master
+ARG NEUTRON_TAG=stable/yoga
RUN apk --no-cache add --update libxml2 libxslt && \
apk --no-cache add --virtual .build-deps --update \
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 29723c709..e188b009d 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,7 +1,7 @@
FROM alpine:3.14
-ARG BRANCH=master
-ARG OPENSTACK_TAG=master
+ARG BRANCH=stable/yoga
+ARG OPENSTACK_TAG=stable/yoga
COPY Switch-to-threading.Thread-for-Rally-tasks.patch /tmp/Switch-to-threading.Thread-for-Rally-tasks.patch
COPY Create-new-server-in-test_create_backup.patch /tmp/Create-new-server-in-test_create_backup.patch
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 404ff2d58..1e3fab224 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:yoga
ARG ODL_TAG=89b88a0a23561f0bda62338b394ec41655679b2d
diff --git a/docker/smoke-cntt/Dockerfile b/docker/smoke-cntt/Dockerfile
index a8e8a6f75..854293966 100644
--- a/docker/smoke-cntt/Dockerfile
+++ b/docker/smoke-cntt/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-smoke
+FROM opnfv/functest-smoke:yoga
COPY testcases.yaml /etc/xtesting/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 da42ef9b4..56933b1f7 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:yoga
ARG PATROLE_TAG=master
ARG NEUTRON_TEMPEST_TAG=master
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 99f848fcd..e997c522a 100644
--- a/docker/vnf/Dockerfile
+++ b/docker/vnf/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-core
+FROM opnfv/functest-core:yoga
ARG VIMS_TEST_TAG=release-130
ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909
diff --git a/tox.ini b/tox.ini
index 2c643f39f..514095fc0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ pip_version = pip==20.2.4
usedevelop = True
deps =
-c{toxinidir}/upper-constraints.txt
- -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
+ -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/stable/yoga/upper-constraints.txt}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
install_command = pip install {opts} {packages}