From 48f57c2831f18e8e09c8a7d7aa5273bf489ab20a 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 gambia 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/features/Dockerfile    |  2 +-
 docker/healthcheck/Dockerfile |  2 +-
 docker/smoke/Dockerfile       |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/build.sh b/build.sh
index 46115f13..20f3c6b5 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:gambia|\
+${repo}/functest-kubernetes-core:amd64-gambia|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:gambia|\
+${repo}/functest-kubernetes-healthcheck:amd64-gambia|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-gambia" .)
+        docker push "${repo}/functest-kubernetes-${dir##**/}:amd64-gambia"
     [ "${dir}" != "docker/core" ] &&
         (docker rmi \
-            "${repo}/functest-kubernetes-${dir##**/}:amd64-latest" || true)
+            "${repo}/functest-kubernetes-${dir##**/}:amd64-gambia" || true)
 done
 [ ! -z "${amd64_dirs}" ] &&
     (docker rmi \
-        "${repo}/functest-kubernetes-core:amd64-latest" alpine:3.8 || true)
+        "${repo}/functest-kubernetes-core:amd64-gambia" 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:gambia|\
+${repo}/functest-kubernetes-core:arm64-gambia|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:gambia|\
+${repo}/functest-kubernetes-healthcheck:arm64-gambia|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-gambia" .)
+    docker push "${repo}/functest-kubernetes-${dir##**/}:arm64-gambia"
     [ "${dir}" != "docker/core" ] &&
         (docker rmi \
-            "${repo}/functest-kubernetes-${dir##**/}:arm64-latest" || true)
+            "${repo}/functest-kubernetes-${dir##**/}:arm64-gambia" || true)
 done
 [ ! -z "${arm64_dirs}" ] &&
-    (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \
+    (docker rmi "${repo}/functest-kubernetes-core:arm64-gambia" \
         multiarch/alpine:arm64-v3.8 || true)
 find . -name Dockerfile -exec git checkout {} +
 
diff --git a/ci/globals.yaml b/ci/globals.yaml
index 805852a5..6e058633 100644
--- a/ci/globals.yaml
+++ b/ci/globals.yaml
@@ -3,7 +3,7 @@
     name: global
     repo: 'opnfv'
     branch: 'master'
-    tag: 'latest'
+    tag: 'gambia'
 
 - defaults:
     name: functest-kubernetes-defaults
diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 9b626d3b..867b7db0 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:gambia
 
 ARG OPENSTACK_TAG=stable/queens
 ARG OPNFV_TAG=master
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 344ea7ff..613b3670 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-core
+FROM opnfv/functest-kubernetes-core:gambia
 
 ARG K8S_TAG=v1.11.2
 
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 137cc16b..04c3b999 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -1,4 +1,4 @@
-FROM opnfv/functest-kubernetes-healthcheck
+FROM opnfv/functest-kubernetes-healthcheck:gambia
 
 COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
 CMD ["run_tests", "-t", "all"]
-- 
cgit