Publish first Functest K8s Jerma containers

It leverages on latest K8s tag (v1.16.1).

Change-Id: I57014c4193c7732c4dfd46d7a29e3104eec652ec
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/.travis.yml b/.travis.yml
index 58a34f2..2cc467d 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,8 +32,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-jerma \
+          --target ${DOCKER_USERNAME}/functest-kubernetes-core:jerma
     - stage: build functest-kubernetes-healthcheck image
       script: sudo -E bash build.sh
       env:
@@ -45,8 +45,8 @@ 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-jerma \
+          --target ${DOCKER_USERNAME}/functest-kubernetes-healthcheck:jerma
     - 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-jerma \
+          --target ${DOCKER_USERNAME}/functest-kubernetes-smoke:jerma

diff --git a/ansible/site.yml b/ansible/site.yml
index b0baf06..8caf605 100644 (file)
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -5,6 +5,9 @@
       project: functest-kubernetes
       db_project: functest
       gerrit_project: functest-kubernetes
+      docker_tags:
+        - jerma:
+            branch: stable/jerma
       builds:
         dependencies:
           - repo: _

diff --git a/build.sh b/build.sh
index 2451d8a..c6fae8d 100644 (file)
--- a/build.sh
+++ b/build.sh
@@ -12,22 +12,22 @@ 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" {} +
+${repo}/functest-kubernetes-core:amd64-jerma|g" {} +
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-kubernetes-healthcheck|\
-${repo}/functest-kubernetes-healthcheck:amd64-latest|g" {} +
+${repo}/functest-kubernetes-healthcheck:amd64-jerma|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-jerma" .)
+        docker push "${repo}/functest-kubernetes-${dir##**/}:amd64-jerma"
     [ "${dir}" != "docker/core" ] &&
         (docker rmi \
-            "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" || true)
+            "${repo}/functest-kubernetes-${dir##**/}:amd64-jerma" || true)
 done
 [ ! -z "${amd64_dirs}" ] &&
     (docker rmi \
-        "${repo}/functest-kubernetes-core:amd64-latest" \
+        "${repo}/functest-kubernetes-core:amd64-jerma" \
         golang:1.12-alpine3.10 || true)
 find . -name Dockerfile -exec git checkout {} +
 
@@ -35,20 +35,20 @@ find . -name Dockerfile -exec sed -i \
     -e "s|golang:1.12-alpine3.10|arm64v8/golang:1.12-alpine3.10|g" {} +
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-kubernetes-core|\
-${repo}/functest-kubernetes-core:arm64-latest|g" {} +
+${repo}/functest-kubernetes-core:arm64-jerma|g" {} +
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-kubernetes-healthcheck|\
-${repo}/functest-kubernetes-healthcheck:arm64-latest|g" {} +
+${repo}/functest-kubernetes-healthcheck:arm64-jerma|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-jerma" .)
+    docker push "${repo}/functest-kubernetes-${dir##**/}:arm64-jerma"
     [ "${dir}" != "docker/core" ] &&
         (docker rmi \
-            "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" || true)
+            "${repo}/functest-kubernetes-${dir##**/}:arm64-jerma" || true)
 done
 [ ! -z "${arm64_dirs}" ] &&
-    (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \
+    (docker rmi "${repo}/functest-kubernetes-core:arm64-jerma" \
         arm64v8/golang:1.12-alpine3.10 || true)
 find . -name Dockerfile -exec git checkout {} +
 

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index c6907a1..f739145 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,8 +1,8 @@
 FROM golang:1.12-alpine3.10
 
-ARG BRANCH=master
-ARG OPENSTACK_TAG=master
-ARG OPNFV_TAG=master
+ARG BRANCH=stable/jerma
+ARG OPENSTACK_TAG=stable/train
+ARG OPNFV_TAG=stable/jerma
 
 RUN apk --no-cache add --update python3 bash git grep libffi openssl && \
     apk --no-cache add --virtual .build-deps --update \

diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 9b751d7..bf7ce2b 100644 (file)
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,6 +1,6 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:jerma
 
-ARG K8S_TAG=master
+ARG K8S_TAG=v1.16.1
 
 RUN apk --no-cache add --update make bash git \
         grep rsync linux-headers musl-dev findutils \

diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 72318e7..6c38b4b 100644 (file)
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-healthcheck
+FROM opnfv/functest-kubernetes-healthcheck:jerma
 
 COPY testcases.yaml /usr/lib/python3.7/site-packages/xtesting/ci/testcases.yaml
 CMD ["run_tests", "-t", "all"]

diff --git a/tox.ini b/tox.ini
index 95a119f..14677f3 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ envlist = pep8,pylint,yamllint,ansiblelint,bashate,py27,py37,bandit,perm
 usedevelop = True
 deps =
   -chttps://git.opnfv.org/functest/plain/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/train/upper-constraints.txt}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
 install_command = pip install {opts} {packages}