Allow conditional docker build args

[releng.git] / jjb / functest / xtesting.yaml

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 97911fc..267514a 100644 (file)
--- 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 .
 
@@ -188,7 +193,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^xtesting-.*-[a-z0-9]*$'
+            - '^xtesting-.*-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -280,7 +285,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^xtesting-.*-[a-z0-9]*$'
+            - '^xtesting-.*-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -352,7 +357,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^xtesting-.*-[a-z0-9]*$'
+            - '^xtesting-.*-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -406,4 +411,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-.*-[a-z0-9]*$
+    regex: ^xtesting-.*-(daily|check|gate)$