Apex: fix daily scm passing and yardstick deploy blocking

Change-Id: I5b8fd2784cbf78aec17bab89c9cd1cbf82324739
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index de485eb..f4919e4 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -529,6 +529,7 @@
             blocking-jobs:
                 - 'apex-deploy.*'
                 - 'functest.*'
+                - 'yardstick.*'
         - throttle:
             max-per-node: 1
             max-total: 10
@@ -637,7 +638,7 @@
     disabled: false
 
     scm:
-        - git-scm-gerrit
+        - git-scm
 
     parameters:
         - '{project}-defaults'
@@ -663,7 +664,7 @@
                   current-parameters: false
                   predefined-parameters: |
                     GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
+                    GERRIT_REFSPEC=''
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                   node-parameters: true
@@ -679,7 +680,7 @@
                   predefined-parameters: |
                     BUILD_DIRECTORY=apex-build-danube/.build
                     GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
+                    GERRIT_REFSPEC=''
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                   node-parameters: true
@@ -968,7 +969,7 @@
     disabled: false
 
     scm:
-        - git-scm-gerrit
+        - git-scm
 
     parameters:
         - '{project}-defaults'
@@ -994,7 +995,7 @@
                   current-parameters: false
                   predefined-parameters: |
                     GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
+                    GERRIT_REFSPEC=''
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                   node-parameters: true
@@ -1010,7 +1011,7 @@
                   predefined-parameters: |
                     BUILD_DIRECTORY=apex-build-master/.build
                     GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
+                    GERRIT_REFSPEC=''
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                   node-parameters: true

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 4334e5a..2466c84 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -529,6 +529,7 @@
             blocking-jobs:
                 - 'apex-deploy.*'
                 - 'functest.*'
+                - 'yardstick.*'
         - throttle:
             max-per-node: 1
             max-total: 10
@@ -637,7 +638,7 @@
     disabled: false
 
     scm:
-        - git-scm-gerrit
+        - git-scm
 
     parameters:
         - '{project}-defaults'
@@ -663,7 +664,7 @@
                   current-parameters: false
                   predefined-parameters: |
                     GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
+                    GERRIT_REFSPEC=''
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                   node-parameters: true
@@ -679,7 +680,7 @@
                   predefined-parameters: |
                     BUILD_DIRECTORY=apex-build-{{ stream }}/.build
                     GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
+                    GERRIT_REFSPEC=''
                     GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
                     GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
                   node-parameters: true