From 5d201d0a539c1e3beeb72bbffd951636b1235087 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 10 Nov 2017 23:39:11 +0100 Subject: Add BRANCH as Docker build arg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 9e72ad1edd88aada55a0328cd72d4941c4e6fc60) --- docker/components/Dockerfile | 3 +++ docker/healthcheck/Dockerfile | 3 +++ 2 files changed, 6 insertions(+) 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"] -- cgit 1.2.3-korg