Merge "Force DNS nameserver in CI jobs to use local consul server."

[ci-management.git] / jjb / ci-management / ci-management-jobs.yaml

diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index e99855e..f33e6e9 100644 (file)
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -6,14 +6,15 @@
       - gerrit-jenkins-cfg-merge
       - gerrit-jenkins-sandbox-cleanup
       - gerrit-jjb-deploy-job
-      - gerrit-jjb-merge
+      - gerrit-jjb-merge:
+          build-node: centos7-builder-4c-4g
       - gerrit-jjb-verify
 
     project: ci-management
     project-name: ci-management
     build-node: centos7-builder-4c-4g
-    build-timeout: 60
-    jjb-version: 2.6.0
+    build-timeout: 15
+    jjb-version: 3.5.0
 
 - project:
     name: ci-management