summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-11-10 23:39:11 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2017-11-10 23:55:35 +0100
commit5d201d0a539c1e3beeb72bbffd951636b1235087 (patch)
treefc196c9d3126deb91ffde677172e9d05ae2cda9d
parent7cd94ecd76db61ec6a2610355103b8d966c83a72 (diff)
Add BRANCH as Docker build arg
It conforms with the prerequisite of the current releng Docker script. BRANCH can be considered as useless because releng already clones the right git branch. It's a temporarily solution before modifying a script used by lots of OPNFV projects. Conflicts: docker/components/Dockerfile docker/healthcheck/Dockerfile Change-Id: I585d7a79a9ebaeaffd69af1da1731c44e131f6b5 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 9e72ad1edd88aada55a0328cd72d4941c4e6fc60)
-rw-r--r--docker/components/Dockerfile3
-rw-r--r--docker/healthcheck/Dockerfile3
2 files changed, 6 insertions, 0 deletions
diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile
index 8794f78de..93567ce26 100644
--- a/docker/components/Dockerfile
+++ b/docker/components/Dockerfile
@@ -1,4 +1,7 @@
FROM opnfv/functest-core:euphrates
+# useless build arg forced by releng/jjb/releng/opnfv-docker.sh
+ARG BRANCH=stable/euphrates
+
COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
CMD ["bash","-c","prepare_env start && run_tests -t all"]
diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 8794f78de..93567ce26 100644
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -1,4 +1,7 @@
FROM opnfv/functest-core:euphrates
+# useless build arg forced by releng/jjb/releng/opnfv-docker.sh
+ARG BRANCH=stable/euphrates
+
COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
CMD ["bash","-c","prepare_env start && run_tests -t all"]