From 9034e104a506be09fe5df28693e869becf1b72e0 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Thu, 28 Mar 2019 07:35:28 +0100 Subject: Publish Functest Kubernetes Iruya MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7ea9454f63b403f140961291a4dd14c563e2a82c Signed-off-by: Cédric Ollivier --- .travis.yml | 16 ++++++++-------- ansible/site.yml | 5 ++++- build.sh | 36 ++++++++++++++++++------------------ docker/core/Dockerfile | 8 ++++---- docker/features/Dockerfile | 6 +++--- docker/healthcheck/Dockerfile | 4 ++-- docker/smoke/Dockerfile | 2 +- tox.ini | 2 +- 8 files changed, 41 insertions(+), 38 deletions(-) diff --git a/.travis.yml b/.travis.yml index 368ae5a3..08bb7c31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,8 @@ jobs: script: > sudo manifest-tool push from-args \ --platforms linux/amd64 \ - --template ${DOCKER_USERNAME}/functest-kubernetes-core:ARCH-latest \ - --target ${DOCKER_USERNAME}/functest-kubernetes-core:latest + --template ${DOCKER_USERNAME}/functest-kubernetes-core:ARCH-iruya \ + --target ${DOCKER_USERNAME}/functest-kubernetes-core:iruya - stage: build functest-kubernetes-[healthcheck,features] image script: sudo -E bash build.sh env: @@ -39,14 +39,14 @@ jobs: sudo manifest-tool push from-args \ --platforms linux/amd64 \ --template \ - ${DOCKER_USERNAME}/functest-kubernetes-healthcheck:ARCH-latest \ - --target ${DOCKER_USERNAME}/functest-kubernetes-healthcheck:latest + ${DOCKER_USERNAME}/functest-kubernetes-healthcheck:ARCH-iruya \ + --target ${DOCKER_USERNAME}/functest-kubernetes-healthcheck:iruya - script: > sudo manifest-tool push from-args \ --platforms linux/amd64 \ --template \ - ${DOCKER_USERNAME}/functest-kubernetes-features:ARCH-latest \ - --target ${DOCKER_USERNAME}/functest-kubernetes-features:latest + ${DOCKER_USERNAME}/functest-kubernetes-features:ARCH-iruya \ + --target ${DOCKER_USERNAME}/functest-kubernetes-features:iruya - stage: build functest-kubernetes-smoke image script: sudo -E bash build.sh env: @@ -57,5 +57,5 @@ jobs: script: > sudo manifest-tool push from-args \ --platforms linux/amd64 \ - --template ${DOCKER_USERNAME}/functest-kubernetes-smoke:ARCH-latest \ - --target ${DOCKER_USERNAME}/functest-kubernetes-smoke:latest + --template ${DOCKER_USERNAME}/functest-kubernetes-smoke:ARCH-iruya \ + --target ${DOCKER_USERNAME}/functest-kubernetes-smoke:iruya diff --git a/ansible/site.yml b/ansible/site.yml index fb5e1aa6..516a1f81 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -5,12 +5,15 @@ project: functest-kubernetes db_project: functest gerrit_project: functest-kubernetes + docker_tags: + - iruya: + branch: stable/iruya builds: dependencies: - repo: _ dport: container: golang - tag: alpine3.9 + tag: 1.12.1-alpine3.9 steps: - name: build opnfv/functest-kubernetes-core containers: diff --git a/build.sh b/build.sh index 46ff4887..d55ee589 100644 --- a/build.sh +++ b/build.sh @@ -12,44 +12,44 @@ 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:iruya|\ +${repo}/functest-kubernetes-core:amd64-iruya:iruya|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:iruya|\ +${repo}/functest-kubernetes-healthcheck:amd64-iruya|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-iruya" .) + docker push "${repo}/functest-kubernetes-${dir##**/}:amd64-iruya" [ "${dir}" != "docker/core" ] && (docker rmi \ - "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" || true) + "${repo}/functest-kubernetes-${dir##**/}:amd64-iruya" || true) done [ ! -z "${amd64_dirs}" ] && (docker rmi \ - "${repo}/functest-kubernetes-core:amd64-latest" golang:alpine3.9 || true) + "${repo}/functest-kubernetes-core:amd64-iruya" golang:1.12.1-alpine3.9 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|golang:alpine3.9|arm64v8/golang:alpine3.9|g" {} + + -e "s|golang:1.12.1-alpine3.9|arm64v8/golang:1.12.1-alpine3.9|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:iruya|\ +${repo}/functest-kubernetes-core:arm64-iruya|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:iruya|\ +${repo}/functest-kubernetes-healthcheck:arm64-iruya|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-iruya" .) + docker push "${repo}/functest-kubernetes-${dir##**/}:arm64-iruya" [ "${dir}" != "docker/core" ] && (docker rmi \ - "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" || true) + "${repo}/functest-kubernetes-${dir##**/}:arm64-iruya" || true) done [ ! -z "${arm64_dirs}" ] && - (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \ - arm64v8/golang:alpine3.9 || true) + (docker rmi "${repo}/functest-kubernetes-core:arm64-iruya" \ + arm64v8/golang:1.11.6-alpine3.9 || true) find . -name Dockerfile -exec git checkout {} + exit $? diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index c84861e9..199295c8 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,8 +1,8 @@ -FROM golang:alpine3.9 +FROM golang:1.12.1-alpine3.9 -ARG BRANCH=master -ARG OPENSTACK_TAG=master -ARG OPNFV_TAG=master +ARG BRANCH=stable/iruya +ARG OPENSTACK_TAG=stable/stein +ARG OPNFV_TAG=stable/iruya RUN apk --no-cache add --update python py-pip bash git grep && \ apk --no-cache add --virtual .build-deps --update \ diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index 16712ab5..9e1123ba 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -1,7 +1,7 @@ -FROM opnfv/functest-kubernetes-core +FROM opnfv/functest-kubernetes-core:iruya -ARG OPENSTACK_TAG=master -ARG OPNFV_TAG=master +ARG OPENSTACK_TAG=stable/stein +ARG OPNFV_TAG=stable/iruya COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --update make py-pip bash git go \ diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile index bafc3c4d..74d2aa27 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,6 +1,6 @@ -FROM opnfv/functest-kubernetes-core +FROM opnfv/functest-kubernetes-core:iruya -ARG K8S_TAG=master +ARG K8S_TAG=v1.13.5 RUN apk --no-cache add --update make py-pip bash git \ grep rsync linux-headers musl-dev findutils \ diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 137cc16b..3868b278 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,4 +1,4 @@ -FROM opnfv/functest-kubernetes-healthcheck +FROM opnfv/functest-kubernetes-healthcheck:iruya COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml CMD ["run_tests", "-t", "all"] diff --git a/tox.ini b/tox.ini index d0a533bd..8865cc63 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ envlist = pep8,pylint,yamllint,ansiblelint,bashate,py27 usedevelop = True deps = -chttps://git.opnfv.org/functest/plain/upper-constraints.txt - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=master} + -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/stein} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt install_command = pip install {opts} {packages} -- cgit 1.2.3-korg