summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-05-18 15:33:35 -0400
committerTim Rozet <trozet@redhat.com>2017-05-18 15:35:36 -0400
commit67fab8844c12845e9948c565b1a2ce24b83360d1 (patch)
treec5415fce7c226bb744cdd3ed3fbdd54eb1b77970 /jjb
parent290dc5a49e23a5100c60ca3e989b1890e7652a46 (diff)
Apex: fix daily scm and functest job blocking with deploy
Change-Id: I355745e42c510029ffc314fa03eb1a5ca1e3e74a Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/apex/apex.yml5
-rw-r--r--jjb/apex/apex.yml.j23
2 files changed, 5 insertions, 3 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 43a0b9fdd..de485eb89 100644
--- 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 a3c56cd82..4334e5a5d 100644
--- 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'