diff options
| -rw-r--r-- | .travis.yml | 28 | ||||
| -rw-r--r-- | ansible/site.cntt.yml | 3 | ||||
| -rw-r--r-- | ansible/site.yml | 3 | ||||
| -rw-r--r-- | build.sh | 36 | ||||
| -rw-r--r-- | docker/benchmarking-cntt/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/benchmarking/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/smoke-cntt/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 4 | ||||
| -rw-r--r-- | docker/vnf/Dockerfile | 4 |
9 files changed, 46 insertions, 40 deletions
diff --git a/.travis.yml b/.travis.yml index 0810c6272..a3f71b116 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-kali \ + --target ${DOCKER_USERNAME}/functest-core:kali - 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-kali \ + --target ${DOCKER_USERNAME}/functest-healthcheck:kali - 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-kali \ + --target ${DOCKER_USERNAME}/functest-smoke:kali - 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-kali \ + --target ${DOCKER_USERNAME}/functest-benchmarking:kali - 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-kali \ + --target ${DOCKER_USERNAME}/functest-vnf:kali - 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-kali \ + --target ${DOCKER_USERNAME}/functest-smoke-cntt:kali - 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-kali \ + --target ${DOCKER_USERNAME}/functest-benchmarking-cntt:kali diff --git a/ansible/site.cntt.yml b/ansible/site.cntt.yml index 8a290c812..5146a2540 100644 --- a/ansible/site.cntt.yml +++ b/ansible/site.cntt.yml @@ -5,6 +5,9 @@ - role: collivier.xtesting project: functest gerrit_project: functest + docker_tags: + - kali: + branch: stable/kali builds: dependencies: - repo: _ diff --git a/ansible/site.yml b/ansible/site.yml index c5b770bb7..31164d02a 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -5,6 +5,9 @@ - role: collivier.xtesting project: functest gerrit_project: functest + docker_tags: + - kali: + branch: stable/kali builds: dependencies: - repo: _ @@ -22,54 +22,54 @@ 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|${repo}/functest-core:amd64-kali|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-tempest|${repo}/functest-tempest:amd64-latest|g" {} + + -e "s|opnfv/functest-tempest|${repo}/functest-tempest:amd64-kali|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-kali" .) + docker push "${repo}/functest-${dir##**/}:amd64-kali" [ "${dir}" != "docker/core" ] && - (docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true) + (docker rmi "${repo}/functest-${dir##**/}:amd64-kali" || true) done [ -n "${amd64_dirs}" ] && - (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.11 || true) + (docker rmi "${repo}/functest-core:amd64-kali" alpine:3.11 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ -e "s|alpine:3.11|arm64v8/alpine:3.11|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} + + -e "s|opnfv/functest-core|${repo}/functest-core:arm64-kali|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-tempest|${repo}/functest-tempest:arm64-latest|g" {} + + -e "s|opnfv/functest-tempest|${repo}/functest-tempest:arm64-kali|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-kali" .) + docker push "${repo}/functest-${dir##**/}:arm64-kali" [ "${dir}" != "docker/core" ] && - (docker rmi "${repo}/functest-${dir##**/}:arm64-latest" || true) + (docker rmi "${repo}/functest-${dir##**/}:arm64-kali" || true) done [ -n "${arm64_dirs}" ] && - (docker rmi "${repo}/functest-core:arm64-latest" \ + (docker rmi "${repo}/functest-core:arm64-kali" \ arm64v8/alpine:3.11 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ -e "s|alpine:3.11|arm32v6/alpine:3.11|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-core|${repo}/functest-core:arm-latest|g" {} + + -e "s|opnfv/functest-core|${repo}/functest-core:arm-kali|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-tempest|${repo}/functest-tempest:arm-latest|g" {} + + -e "s|opnfv/functest-tempest|${repo}/functest-tempest:arm-kali|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-kali" .) + docker push "${repo}/functest-${dir##**/}:arm-kali" [ "${dir}" != "docker/core" ] && - (docker rmi "${repo}/functest-${dir##**/}:arm-latest" || true) + (docker rmi "${repo}/functest-${dir##**/}:arm-kali" || true) done [ -n "${arm_dirs}" ] && - (docker rmi "${repo}/functest-core:arm-latest" \ + (docker rmi "${repo}/functest-core:arm-kali" \ arm32v6/alpine:3.11 || true) find . -name Dockerfile -exec git checkout {} + diff --git a/docker/benchmarking-cntt/Dockerfile b/docker/benchmarking-cntt/Dockerfile index 2f4e0dbee..ae1d115e0 100644 --- a/docker/benchmarking-cntt/Dockerfile +++ b/docker/benchmarking-cntt/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-benchmarking +FROM opnfv/functest-benchmarking:kali COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml COPY blacklist.yaml /usr/lib/python3.8/site-packages/functest/opnfv_tests/openstack/rally/blacklist.yaml diff --git a/docker/benchmarking/Dockerfile b/docker/benchmarking/Dockerfile index 715aab1a5..abdf39287 100644 --- a/docker/benchmarking/Dockerfile +++ b/docker/benchmarking/Dockerfile @@ -1,6 +1,6 @@ -FROM opnfv/functest-core +FROM opnfv/functest-core:kali -ARG BRANCH=master +ARG BRANCH=stable/kali ARG OPENSTACK_TAG=master ARG VMTP_TAG=master ARG NEUTRON_TAG=master diff --git a/docker/smoke-cntt/Dockerfile b/docker/smoke-cntt/Dockerfile index c6b097093..f92ad25d4 100644 --- a/docker/smoke-cntt/Dockerfile +++ b/docker/smoke-cntt/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-smoke +FROM opnfv/functest-smoke:kali COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml COPY tempest_conf.yaml /usr/lib/python3.8/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index c49cb5518..6a0e7ddfe 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,6 +1,6 @@ -FROM opnfv/functest-core +FROM opnfv/functest-core:kali -ARG BRANCH=master +ARG BRANCH=stable/kali ARG OPENSTACK_TAG=master ARG PATROLE_TAG=master ARG NEUTRON_TEMPEST_TAG=master diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index b59a97574..25fd6a074 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -1,6 +1,6 @@ -FROM opnfv/functest-core +FROM opnfv/functest-core:kali -ARG BRANCH=master +ARG BRANCH=stable/kali ARG OPENSTACK_TAG=master ARG VIMS_TEST_TAG=release-130 ARG QUAFF_TAG=59213d6d8ee29433552bb75f505cdc96b0b18909 |