Install lftools using the global-jjb scripts

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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 2f309173fb5edde835affdbc92d719e9a5afc2a2..e139fc0749fc612b3c2dbdd2a1fc94c60bff4479 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -21,7 +21,6 @@
 
     templates:
       - devstack
-      - devstack-pre-pip-mitaka
       - devstack-pre-pip-newton
       - docker
       - gbp
@@ -41,8 +40,6 @@
         templates: java-builder
       - platforms: ubuntu-14.04
         templates: robot
-      - platforms: ubuntu-14.04
-        templates: devstack-pre-pip-mitaka
       - platforms: ubuntu-14.04
         templates: devstack-pre-pip-newton
       - platforms: ubuntu-14.04
@@ -55,8 +52,6 @@
         templates: java-builder
       - platforms: ubuntu-16.04
         templates: robot
-      - platforms: ubuntu-16.04
-        templates: devstack-pre-pip-mitaka
       - platforms: ubuntu-16.04
         templates: devstack-pre-pip-newton
       - platforms: ubuntu-16.04
@@ -125,6 +120,14 @@
       - opendaylight-infra-properties:
           build-days-to-keep: 7
 
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+
     wrappers:
       - opendaylight-infra-wrappers:
           build-timeout: '{build-timeout}'
@@ -178,7 +181,9 @@
       - timed: '@weekly'
 
     builders:
-      - shell: !include-raw-escape: opendaylight-infra-cleanup-old-images.sh
+      - shell: !include-raw-escape:
+          - global-jjb/shell/lftools-install.sh
+          - opendaylight-infra-cleanup-old-images.sh
 
     publishers:
       - email-notification: