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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index ba5479ee1..7a1bb1b98 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -2,52 +2,50 @@
 - project:
     name: builder-jobs
     jobs:
-      - '{project-name}-rtd-jobs':
+      - "{project-name}-rtd-jobs":
           project-pattern: releng/builder
           rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-releng-builder/32926/
           rtd-token: e9fa62bd60a39c22de631791309ccacc37a9929e
-      - gerrit-jenkins-cfg-merge:
+      - 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
       - builder-check-poms
       - builder-copy-sandbox-logs
       - gerrit-tox-verify
       # Automation for docs and jobs
-      - 'builder-update-image-list'
+      - "builder-update-image-list":
+          archive-artifacts: docs/cloud-images.rst
+      - gerrit-info-yaml-verify
 
     # The following values are only specified here
     # so that code blocks look similar to other projects.
-    project: 'releng/builder'
+    project: "releng/builder"
     project-name: builder
     stream: master
     branch: master
-    build-node: centos7-builder-2c-2g
-    archive-artifacts: '**/*.log'
+    build-node: centos8-builder-2c-2g
+    archive-artifacts: "**/*.log"
     build-timeout: 30
-    jjb-version: 2.8.0
+    jjb-version: 5.0.2
 
 - project:
     name: builder-openstack
     jobs:
       - gerrit-openstack-cron
 
-    project: 'releng/builder'
+    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
-        https://jenkins.opendaylight.org/sandbox
+      https://jenkins.opendaylight.org/releng
+      https://jenkins.opendaylight.org/sandbox
     openstack-cloud: vex
 
 - job-template:
     name: builder-check-poms
-    node: centos7-builder-2c-1g
+    node: centos8-builder-2c-1g
 
     project-type: freestyle
 
@@ -57,31 +55,31 @@
 
     parameters:
       - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
 
     wrappers:
       - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"
 
     triggers:
-      - timed: 'H H * * 1'
+      - timed: "H H * * 1"
 
     builders:
       - shell: !include-raw-escape: check-poms.sh
 
     publishers:
       - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[releng]"
       - lf-infra-publish
 
 - job-template:
     name: builder-copy-sandbox-logs
-    node: centos7-builder-2c-1g
+    node: centos8-builder-2c-1g
 
     project-type: freestyle
 
@@ -91,11 +89,11 @@
 
     parameters:
       - opendaylight-infra-parameters:
-          os-cloud: ''
-          project: ''
-          branch: ''
-          refspec: ''
-          artifacts: ''
+          os-cloud: ""
+          project: ""
+          branch: ""
+          refspec: ""
+          artifacts: ""
 
     wrappers:
       - opendaylight-infra-wrappers:
@@ -103,16 +101,16 @@
 
     triggers:
       - gerrit:
-          server-name: '{gerrit-server-name}'
+          server-name: "{gerrit-server-name}"
           trigger-on:
             - comment-added-contains-event:
-                comment-contains-value: 'copy-logs:'
+                comment-contains-value: "copy-logs:"
           projects:
             - project-compare-type: ANT
-              project-pattern: '**'
+              project-pattern: "**"
               branches:
                 - branch-compare-type: ANT
-                  branch-pattern: '**'
+                  branch-pattern: "**"
 
     builders:
       - shell: !include-raw-escape: copy-sandbox-logs.sh
@@ -120,11 +118,10 @@
     publishers:
       - lf-infra-publish
 
-
 - job-template:
-    name: 'builder-update-image-list'
+    name: "builder-update-image-list"
     project-type: freestyle
-    node: centos7-builder-2c-1g
+    node: centos8-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -133,40 +130,41 @@
     parameters:
       - opendaylight-infra-parameters:
           os-cloud: vex
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
 
     scm:
       - git-scm:
-          branch: '{branch}'
+          branch: "{branch}"
 
     wrappers:
       - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"
       # Listed after to override openstack-infra-wrappers clouds.yaml definition
       - config-file-provider:
           files:
             - file-id: clouds-yaml
-              target: '$HOME/.config/openstack/clouds.yaml'
+              target: "$HOME/.config/openstack/clouds.yaml"
 
     triggers:
       # Update image list every Monday to Friday at 11:00 UTC
-      - timed: '0 11 * * 1-5'
+      - timed: "0 11 * * 1-5"
 
     builders:
+      - lf-infra-pre-build
       - shell: !include-raw-escape: opendaylight-infra-update-image-list.sh
       - lf-infra-push-gerrit-patch:
-          project: '{project}'
-          gerrit-user: 'jenkins-$SILO'
-          gerrit-host: 'git.opendaylight.org'
-          gerrit-topic: 'releng-update-cloud-image-list'
-          gerrit-commit-message: 'Update cloud image list docs'
-          reviewers-email: 'jluhrsen@redhat.com'
+          project: "{project}"
+          gerrit-user: "jenkins-$SILO"
+          gerrit-host: "git.opendaylight.org"
+          gerrit-topic: "releng-update-cloud-image-list"
+          gerrit-commit-message: "Update cloud image list docs"
+          reviewers-email: "jenkins-releng@opendaylight.org"
 
     publishers:
       - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
+          email-recipients: "{email-recipients}"
+          email-prefix: "[releng]"
       - lf-infra-publish