Making sure the BUILD_ARGS are set right for Apex daily

[releng.git] / jjb / apex / apex.yml

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 0685a63..89b0a93 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -110,11 +110,11 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - "apex-daily.*"
-                - "apex-deploy.*"
-                - "apex-build.*"
-                - "apex-runner.*"
-                - 'apex-verify-{block-stream}'
+                - 'apex-daily.*{stream2}'
+                - 'apex-deploy.*{stream2}'
+                - 'apex-build.*{stream2}'
+                - 'apex-runner.*{stream2}'
+                - 'apex-verify-{stream2}'
 
     builders:
         - 'apex-build'
@@ -204,11 +204,11 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - "apex-daily.*"
-                - "apex-deploy.*"
-                - "apex-build.*"
-                - "apex-runner.*"
-                - 'apex-verify-{block-stream}'
+                - 'apex-daily.*{stream1}'
+                - 'apex-deploy.*{stream1}'
+                - 'apex-build.*{stream1}'
+                - 'apex-runner.*{stream1}'
+                - 'apex-verify-{stream1}'
 
     builders:
         - 'apex-build'
@@ -252,8 +252,8 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - "apex-daily.*"
-                - "apex-verify.*"
+                - 'apex-daily.*{stream}'
+                - 'apex-verify.*{stream}'
 
     builders:
         - trigger-builds:
@@ -315,7 +315,7 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - "apex-deploy.*"
+                - 'apex-deploy.*{stream}'
 
     builders:
         - 'apex-build'
@@ -364,7 +364,7 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - "apex-deploy.*"
+                - 'apex-deploy.*{stream}'
 
     builders:
         - 'apex-deploy-virtual'
@@ -402,9 +402,9 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - "apex-verify.*"
-                - "apex-deploy.*"
-                - "apex-build.*"
+                - 'apex-verify.*{stream}'
+                - 'apex-deploy.*{stream}'
+                - 'apex-build.*{stream}'
 
 
     builders:
@@ -440,10 +440,10 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - "apex-verify.*"
-                - "apex-deploy.*"
-                - "apex-build.*"
-                - "apex-runner.*"
+                - 'apex-verify.*{stream2}'
+                - 'apex-deploy.*{stream2}'
+                - 'apex-build.*{stream2}'
+                - 'apex-runner.*{stream2}'
 
     triggers:
         - 'apex-{stream2}'
@@ -557,10 +557,10 @@
         - build-blocker:
             use-build-blocker: true
             blocking-jobs:
-                - "apex-verify.*"
-                - "apex-deploy.*"
-                - "apex-build.*"
-                - "apex-runner.*"
+                - 'apex-verify.*{stream1}'
+                - 'apex-deploy.*{stream1}'
+                - 'apex-build.*{stream1}'
+                - 'apex-runner.*{stream1}'
 
     triggers:
         - 'apex-{stream1}'
@@ -663,10 +663,17 @@
                 export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY --iso"
               fi
             else
-                export OPNFV_ARTIFACT_VERSION=${ARTIFACT_VERSION}
+              export OPNFV_ARTIFACT_VERSION=${ARTIFACT_VERSION}
+              if echo $GERRIT_BRANCH | grep "brahmaputra" 1> /dev/null; then
+                export BUILD_ARGS="-v $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY $BUILD_DIRECTORY"
+              else
+                export BUILD_ARGS="-r $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY --iso"
+              fi
             fi
             # clean for stable but doesn't matter for master
-            sudo opnfv-clean || echo ""
+            if echo $GERRIT_BRANCH | grep "brahmaputra" 1> /dev/null; then
+              sudo opnfv-clean
+            fi
             # start the build
             cd $WORKSPACE/ci
             ./build.sh $BUILD_ARGS