X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=8b35fbf77a2b46bd8202baf73851a9677052fb5c;hp=1f7c6a158982246e252095cddf8d8dcb8b227712;hb=HEAD;hpb=1b3e81190421153b52f9126030d2cfd1198d38d7

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 1f7c6a158..7a1bb1b98 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -6,17 +6,10 @@
           project-pattern: releng/builder
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-releng-builder/32926/
           rtd-token: e9fa62bd60a39c22de631791309ccacc37a9929e
-      - gerrit-jenkins-cfg-merge:
-          jenkins-silos: releng sandbox
       - gerrit-jenkins-cfg-verify:
           jenkins-silos: releng sandbox
       - gerrit-jenkins-sandbox-cleanup
       - gerrit-jjb-deploy-job
-      - gerrit-jjb-merge:
-          build-node: centos7-builder-4c-4g
-          build-timeout: 90
-      - gerrit-jjb-verify:
-          build-timeout: 90
       - builder-check-poms
       - builder-copy-sandbox-logs
       - gerrit-tox-verify
@@ -31,10 +24,10 @@
     project-name: builder
     stream: master
     branch: master
-    build-node: centos7-builder-2c-2g
+    build-node: centos8-builder-2c-2g
     archive-artifacts: "**/*.log"
     build-timeout: 30
-    jjb-version: 3.5.0
+    jjb-version: 5.0.2
 
 - project:
     name: builder-openstack
@@ -43,7 +36,7 @@
 
     project: "releng/builder"
     project-name: builder
-    build-node: centos7-builder-2c-2g
+    build-node: centos8-builder-2c-2g
 
     jenkins-urls: >
       https://jenkins.opendaylight.org/releng
@@ -52,7 +45,7 @@
 
 - job-template:
     name: builder-check-poms
-    node: centos7-builder-2c-1g
+    node: centos8-builder-2c-1g
 
     project-type: freestyle
 
@@ -86,7 +79,7 @@
 
 - job-template:
     name: builder-copy-sandbox-logs
-    node: centos7-builder-2c-1g
+    node: centos8-builder-2c-1g
 
     project-type: freestyle
 
@@ -128,7 +121,7 @@
 - job-template:
     name: "builder-update-image-list"
     project-type: freestyle
-    node: centos7-builder-2c-1g
+    node: centos8-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties: