X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fci-management%2Fci-management-jobs.yaml;h=762a4ff910e41b5f0800ae2c44cc3e8d29d49063;hb=refs%2Fchanges%2F33%2F31833%2F1;hp=b071cb95aceb82f86db9e3a31f4e87bc20234b3d;hpb=9d70c744cd4b65ca2e6ed7be5742aa56f0b85b76;p=ci-management.git

diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index b071cb95a..762a4ff91 100644
--- a/jjb/ci-management/ci-management-jobs.yaml
+++ b/jjb/ci-management/ci-management-jobs.yaml
@@ -3,16 +3,18 @@
     name: ci-management-ci-jobs
     jobs:
       - gerrit-jenkins-cfg-verify
+      - 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: 30
-    jjb-version: 2.6.0
+    build-timeout: 15
+    jjb-version: 3.5.0
 
 - project:
     name: ci-management
@@ -25,6 +27,6 @@
     project-name: ci-management
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-4c-4g
+    build-node: centos7-builder-8c-8g
     project: ci-management
     branch: master