From 0712285f0d242eb9279e49a653f64f63842265c9 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Thu, 13 Sep 2018 09:30:32 +0200
Subject: Prepare Functest K8s hunter containers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ia53b029eb1137b7fffb51eeb6395d69f70d11f75
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 build.sh                      | 32 ++++++++++++++++----------------
 ci/globals.yaml               |  2 +-
 docker/core/Dockerfile        |  2 +-
 docker/features/Dockerfile    |  4 ++--
 docker/healthcheck/Dockerfile |  2 +-
 docker/smoke/Dockerfile       |  2 +-
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/build.sh b/build.sh
index 46115f13..9f851218 100644
--- a/build.sh
+++ b/build.sh
@@ -12,43 +12,43 @@ 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:hunter|\
+${repo}/functest-kubernetes-core:amd64-hunter|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:hunter|\
+${repo}/functest-kubernetes-healthcheck:amd64-hunter|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-hunter" .)
+        docker push "${repo}/functest-kubernetes-${dir##**/}:amd64-hunter"
     [ "${dir}" != "docker/core" ] &&
         (docker rmi \
-            "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" || true)
+            "${repo}/functest-kubernetes-${dir##**/}:amd64-hunter" || true)
 done
 [ ! -z "${amd64_dirs}" ] &&
     (docker rmi \
-        "${repo}/functest-kubernetes-core:amd64-latest" alpine:3.8 || true)
+        "${repo}/functest-kubernetes-core:amd64-hunter" alpine:3.8 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
     -e "s|alpine:3.8|multiarch/alpine:arm64-v3.8|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:hunter|\
+${repo}/functest-kubernetes-core:arm64-hunter|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:hunter|\
+${repo}/functest-kubernetes-healthcheck:arm64-hunter|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-hunter" .)
+    docker push "${repo}/functest-kubernetes-${dir##**/}:arm64-hunter"
     [ "${dir}" != "docker/core" ] &&
         (docker rmi \
-            "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" || true)
+            "${repo}/functest-kubernetes-${dir##**/}:arm64-hunter" || true)
 done
 [ ! -z "${arm64_dirs}" ] &&
-    (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \
+    (docker rmi "${repo}/functest-kubernetes-core:arm64-hunter" \
         multiarch/alpine:arm64-v3.8 || true)
 find . -name Dockerfile -exec git checkout {} +
 
diff --git a/ci/globals.yaml b/ci/globals.yaml
index 805852a5..c2ac506d 100644
--- a/ci/globals.yaml
+++ b/ci/globals.yaml
@@ -3,7 +3,7 @@
     name: global
     repo: 'opnfv'
     branch: 'master'
-    tag: 'latest'
+    tag: 'hunter'
 
 - defaults:
     name: functest-kubernetes-defaults
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 5150c393..faf0aea0 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine:3.8
 
 ARG BRANCH=master
-ARG OPENSTACK_TAG=stable/queens
+ARG OPENSTACK_TAG=stable/rocky
 ARG OPNFV_TAG=master
 
 RUN apk --no-cache add --update python py-pip bash git grep && \
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 9b626d3b..567e7978 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -1,6 +1,6 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:hunter
 
-ARG OPENSTACK_TAG=stable/queens
+ARG OPENSTACK_TAG=stable/rocky
 ARG OPNFV_TAG=master
 
 RUN apk --no-cache add --update make py-pip bash git go \
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 344ea7ff..ead750b1 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:hunter
 
 ARG K8S_TAG=v1.11.2
 
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 137cc16b..6df75f75 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-healthcheck
+FROM opnfv/functest-kubernetes-healthcheck:hunter
 
 COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
 CMD ["run_tests", "-t", "all"]
-- 
cgit 1.2.3-korg