From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Tue, 19 Sep 2017 12:17:06 +0000 (+0200)
Subject: Update Docker hooks
X-Git-Tag: opnfv-5.0.RC1~60
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=124a658f45154235af466d70cb8364ef4ab79a36;p=functest.git

Update Docker hooks

It takes euphrates into account in Docker tag name.

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

diff --git a/docker/components/hooks/post_checkout b/docker/components/hooks/post_checkout
index 20a6d4b95..8f5e4337a 100644
--- a/docker/components/hooks/post_checkout
+++ b/docker/components/hooks/post_checkout
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-from="${DOCKER_REPO%/*}/functest-core"
+from="${DOCKER_REPO%/*}/functest-core:euphrates"
 sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
 
 exit $?
diff --git a/docker/features/hooks/post_checkout b/docker/features/hooks/post_checkout
index 20a6d4b95..8f5e4337a 100644
--- a/docker/features/hooks/post_checkout
+++ b/docker/features/hooks/post_checkout
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-from="${DOCKER_REPO%/*}/functest-core"
+from="${DOCKER_REPO%/*}/functest-core:euphrates"
 sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
 
 exit $?
diff --git a/docker/healthcheck/hooks/post_checkout b/docker/healthcheck/hooks/post_checkout
index 20a6d4b95..8f5e4337a 100644
--- a/docker/healthcheck/hooks/post_checkout
+++ b/docker/healthcheck/hooks/post_checkout
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-from="${DOCKER_REPO%/*}/functest-core"
+from="${DOCKER_REPO%/*}/functest-core:euphrates"
 sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
 
 exit $?
diff --git a/docker/parser/hooks/post_checkout b/docker/parser/hooks/post_checkout
index 20a6d4b95..8f5e4337a 100644
--- a/docker/parser/hooks/post_checkout
+++ b/docker/parser/hooks/post_checkout
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-from="${DOCKER_REPO%/*}/functest-core"
+from="${DOCKER_REPO%/*}/functest-core:euphrates"
 sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
 
 exit $?
diff --git a/docker/restapi/hooks/post_checkout b/docker/restapi/hooks/post_checkout
index 20a6d4b95..8f5e4337a 100644
--- a/docker/restapi/hooks/post_checkout
+++ b/docker/restapi/hooks/post_checkout
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-from="${DOCKER_REPO%/*}/functest-core"
+from="${DOCKER_REPO%/*}/functest-core:euphrates"
 sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
 
 exit $?
diff --git a/docker/smoke/hooks/post_checkout b/docker/smoke/hooks/post_checkout
index 20a6d4b95..8f5e4337a 100644
--- a/docker/smoke/hooks/post_checkout
+++ b/docker/smoke/hooks/post_checkout
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-from="${DOCKER_REPO%/*}/functest-core"
+from="${DOCKER_REPO%/*}/functest-core:euphrates"
 sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
 
 exit $?
diff --git a/docker/vnf/hooks/post_checkout b/docker/vnf/hooks/post_checkout
index 20a6d4b95..8f5e4337a 100644
--- a/docker/vnf/hooks/post_checkout
+++ b/docker/vnf/hooks/post_checkout
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-from="${DOCKER_REPO%/*}/functest-core"
+from="${DOCKER_REPO%/*}/functest-core:euphrates"
 sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
 
 exit $?