Merge "Update cloud image Ubuntu18.04 mininet ovs"

[releng/builder.git] / jjb / releng-jobs.yaml

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 1f7c6a158982246e252095cddf8d8dcb8b227712..e62fb572379ada7a5e5d93b854d612beed3557c6 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -6,14 +6,12 @@
           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-node: centos8-builder-4c-4g
           build-timeout: 90
       - gerrit-jjb-verify:
           build-timeout: 90
@@ -31,10 +29,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: 4.1.0
 
 - project:
     name: builder-openstack
@@ -43,7 +41,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 +50,7 @@
 
 - job-template:
     name: builder-check-poms
-    node: centos7-builder-2c-1g
+    node: centos8-builder-2c-1g
 
     project-type: freestyle
 
@@ -86,7 +84,7 @@
 
 - job-template:
     name: builder-copy-sandbox-logs
-    node: centos7-builder-2c-1g
+    node: centos8-builder-2c-1g
 
     project-type: freestyle
 
@@ -128,7 +126,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: