Remove ocpplugin carbon jobs

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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 0dd4d44aaf6a948c43f954617ae8a301e23dc3aa..68b63a3ca5178b4d3a77e0da0200d916b8238c03 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -29,7 +29,7 @@
     build-node: centos7-builder-2c-2g
     archive-artifacts: '**/*.log'
     build-timeout: 30
-    jjb-version: 2.0.3
+    jjb-version: 2.0.5
     jenkins-urls: >
       https://jenkins.opendaylight.org/releng
       https://jenkins.opendaylight.org/sandbox
@@ -166,6 +166,7 @@
     name: builder-openstack-cron
     project-type: freestyle
     node: '{build-node}'
+    concurrent: true
 
     properties:
       - lf-infra-properties:
@@ -203,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