Apex: fix daily scm and functest job blocking with deploy

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

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 43a0b9f..de485eb 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -528,6 +528,7 @@
             block-level: 'NODE'
             blocking-jobs:
                 - 'apex-deploy.*'
+                - 'functest.*'
         - throttle:
             max-per-node: 1
             max-total: 10
@@ -636,7 +637,7 @@
     disabled: false
 
     scm:
-        - git-scm
+        - git-scm-gerrit
 
     parameters:
         - '{project}-defaults'
@@ -967,7 +968,7 @@
     disabled: false
 
     scm:
-        - git-scm
+        - git-scm-gerrit
 
     parameters:
         - '{project}-defaults'

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index a3c56cd..4334e5a 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -528,6 +528,7 @@
             block-level: 'NODE'
             blocking-jobs:
                 - 'apex-deploy.*'
+                - 'functest.*'
         - throttle:
             max-per-node: 1
             max-total: 10
@@ -636,7 +637,7 @@
     disabled: false
 
     scm:
-        - git-scm
+        - git-scm-gerrit
 
     parameters:
         - '{project}-defaults'