X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=9fad16fc8dd1651e7a2a2cdccaf5dab9267a803a;hb=9d38db6bfdd4ec9179596003fe2bd0b97d6a56bc;hp=f0af74ad67c545724b24a7a488a95551ed1aebf3;hpb=ca17c424932633b903f5e2cbdfdbccaae71b77c2;p=releng%2Fbuilder.git

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index f0af74ad6..9fad16fc8 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -4,7 +4,8 @@
     jobs:
       - '{project-name}-rtd-jobs':
           project-pattern: releng/builder
-          rtd-project: opendaylight-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-jjb-deploy-job
@@ -28,7 +29,7 @@
     build-node: centos7-builder-2c-2g
     archive-artifacts: '**/*.log'
     build-timeout: 30
-    jjb-version: 2.0.3
+    jjb-version: 2.0.6
     jenkins-urls: >
       https://jenkins.opendaylight.org/releng
       https://jenkins.opendaylight.org/sandbox
@@ -165,6 +166,7 @@
     name: builder-openstack-cron
     project-type: freestyle
     node: '{build-node}'
+    concurrent: true
 
     properties:
       - lf-infra-properties:
@@ -179,7 +181,12 @@
       - string:
           name: OS_CLOUD
           default: '{os-cloud}'
-          description: Artifacts to archive to the logs server.
+          description: |
+              The name of a cloud configuration in clouds.yaml. OS_CLOUD is a
+              variable name that is significant to openstack client as a
+              environment variable. Please refer to the documentation for
+              further details.
+              https://docs.openstack.org/developer/python-openstackclient/
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
@@ -202,17 +209,22 @@
           files:
             - file-id: clouds-yaml
               target: '$HOME/.config/openstack/clouds.yaml'
+            - file-id: npmrc
+              target: '$HOME/.npmrc'
+            - file-id: pipconf
+              target: '$HOME/.config/pip/pip.conf'
 
     triggers:
       - timed: '0,30 * * * *'
 
     builders:
       - odl-openstack-install
-      - shell: !include-raw-escape: global-jjb/shell/lftools-install.sh
       # Servers
       - odl-openstack-cleanup-stale-stacks
       - odl-openstack-cleanup-stale-nodes
       - odl-openstack-cleanup-orphaned-nodes
+      # Volumes
+      - odl-openstack-cleanup-stale-volumes
       # Images
       - odl-openstack-check-image-protection
       - odl-openstack-cleanup-old-images
@@ -256,10 +268,13 @@
 
     builders:
       - shell: !include-raw-escape: opendaylight-infra-update-image-list.sh
-      - opendaylight-infra-push-gerrit-patch:
+      - 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'
 
     publishers:
       - email-notification: