Merge "Install lftools into the openstack venv"

[releng/builder.git] / jjb / integration / integration-templates.yaml

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index fa0db5bfc99eeefe5db684babc34d59409f2de5f..7bc5e1e0068c416e661a3053f09c637c71bb18f4 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -118,6 +118,7 @@
           email-prefix: '[{project}]'
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
@@ -152,6 +153,8 @@
           controller-scope: '{scope}'
       - integration-controller-features:
           controller-features: '{install-features}'
+      - integration-controller-debug-map:
+          controller-debug-map: '{debug-map}'
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-stream-test-plan:
@@ -354,6 +357,7 @@
                 format: csv
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
@@ -449,6 +453,7 @@
           email-prefix: '[{project}]'
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
@@ -482,6 +487,8 @@
           controller-scope: '{scope}'
       - integration-controller-features:
           controller-features: 'odl-jolokia,{install-features}'
+      - integration-controller-debug-map:
+          controller-debug-map: '{debug-map}'
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-stream-test-plan:
@@ -680,6 +687,7 @@
                 format: csv
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
@@ -797,6 +805,7 @@
                 format: csv
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
@@ -1004,6 +1013,7 @@
           email-prefix: '[{project}]'
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
@@ -1213,6 +1223,7 @@
           email-prefix: '[{project}]'
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 # Template: {project}-patch-test-{stream}
@@ -1251,7 +1262,7 @@
           default: 'all'
           description: 'Specific feature test for patch'
       - maven-exec:
-          maven-version: mvn33
+          maven-version: mvn35
 
     scm:
       - integration-gerrit-scm:
@@ -1289,7 +1300,7 @@
       - integration-rebase-gerrit-patch
       - wipe-org-opendaylight-repo
       - maven-target:
-          maven-version: mvn33
+          maven-version: mvn35
           pom: '{project}/pom.xml'
           goals: |
               clean install dependency:tree
@@ -1307,7 +1318,7 @@
           global-settings: global-settings
           global-settings-type: cfp
       - maven-target:
-          maven-version: mvn33
+          maven-version: mvn35
           pom: distribution/pom.xml
           goals: |
               clean install dependency:tree