From ab4b5a257813b172aebd409f68c6483d6383bb99 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Sat, 5 Jan 2019 13:56:30 +0100
Subject: [PATCH] Allow conditional docker build args
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

It allows managing xtesting and functest jjbs via the same role.
functest-component doesn't take BRANCH into account.

Change-Id: If487e8350bca6b37d585a4ed16214e77df6170ae
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 jjb/functest/xtesting.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 8e2b1e82c..267514a24 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -73,8 +73,13 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          if [ "{ref_arg}" = "None" ]; then
+            build_arg=""
+          else
+            build_arg="--build-arg {ref_arg}={ref}"
+          fi
           cd {path}
-          sudo docker build --build-arg {ref_arg}={ref} \
+          sudo docker build $build_arg \
             --pull=false --no-cache --force-rm=true \
             -t $image .
 
-- 
2.16.6