Merge "Fix cloud-images.rst generation script"

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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 15005dc954967ee55794ec4958feab43b5160eaf..a832fc1f1504b5bcf755be9eda9259c6d3e210e0 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -21,8 +21,9 @@
       - builder-copy-sandbox-logs
       - gerrit-tox-verify
       # Automation for docs and jobs
-      - 'builder-update-image-list'
-      - 'builder-update-images'
+      - "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.
@@ -33,7 +34,7 @@
     build-node: centos7-builder-2c-2g
     archive-artifacts: '**/*.log'
     build-timeout: 30
-    jjb-version: 2.9.1
+    jjb-version: 3.5.0
 
 - project:
     name: builder-openstack
@@ -160,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}'
@@ -174,55 +176,3 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
       - lf-infra-publish
-
-
-- job-template:
-    name: 'builder-update-images'
-    project-type: freestyle
-    node: centos7-builder-2c-1g
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: vex
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - git-scm:
-          branch: '{branch}'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          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'
-
-    triggers:
-      # Update images the day after packer images are built every month on 2nd
-      - timed: '00 H 2 * *'
-
-    builders:
-      - lf-infra-pre-build
-      - shell: !include-raw-escape: opendaylight-infra-update-images.sh
-      - lf-infra-push-gerrit-patch:
-          project: '{project}'
-          gerrit-user: 'jenkins-$SILO'
-          gerrit-host: 'git.opendaylight.org'
-          gerrit-topic: 'releng-update-cloud-images'
-          gerrit-commit-message: 'Update image to the latest'
-          reviewers-email: 'jenkins-releng@opendaylight.org'
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
-      - lf-infra-publish