From: Cédric Ollivier Date: Fri, 10 Nov 2017 22:39:11 +0000 (+0100) Subject: Add BRANCH as Docker build arg X-Git-Tag: opnfv-6.0.0~333 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F67%2F47067%2F1;p=functest.git 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. Change-Id: I585d7a79a9ebaeaffd69af1da1731c44e131f6b5 Signed-off-by: Cédric Ollivier --- diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile index 8923e4cd7..33e20eef3 100644 --- a/docker/components/Dockerfile +++ b/docker/components/Dockerfile @@ -1,4 +1,7 @@ FROM opnfv/functest-core +# useless build arg forced by releng/jjb/releng/opnfv-docker.sh +ARG BRANCH=master + 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 8923e4cd7..33e20eef3 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -1,4 +1,7 @@ FROM opnfv/functest-core +# useless build arg forced by releng/jjb/releng/opnfv-docker.sh +ARG BRANCH=master + COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml CMD ["bash","-c","prepare_env start && run_tests -t all"]