Merge "Remove of-config carbon jobs"

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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 62a110906d369ef8a3c90ada4d0a50548df215f3..c1f1c0897de973b6ace8c30dee9c881ed61e19ef 100644 (file)
--- 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.0
+    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:
@@ -202,17 +204,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