Merge "Split out release-merge job to separate project"

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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index ba5479ee141cd44e51899a3dbef5041c59c69998..a832fc1f1504b5bcf755be9eda9259c6d3e210e0 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -8,17 +8,22 @@
           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
+      - gerrit-jjb-verify:
+          build-timeout: 90
       - 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.
@@ -29,7 +34,7 @@
     build-node: centos7-builder-2c-2g
     archive-artifacts: '**/*.log'
     build-timeout: 30
-    jjb-version: 2.8.0
+    jjb-version: 3.5.0
 
 - project:
     name: builder-openstack
@@ -156,6 +161,7 @@
       - 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}'
@@ -163,7 +169,7 @@
           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'
+          reviewers-email: 'jluhrsen@gmail.com'
 
     publishers:
       - email-notification: