X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=cf0525e290eb2d45517e014c0f928aca447d6ae5;hb=7c2608254d8a510175c659fd39f566a942908854;hp=40cd2f1114a3667a2f5b189b92b781ca72a0f765;hpb=42d935b040cba9d447948454b0baeff712c7797d;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 40cd2f111..cf0525e29 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -109,8 +109,8 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - integration-csit-run-postscript
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-csit-1node-{functionality}-{install}-{stream}'
@@ -225,8 +225,8 @@
                 display-table: true
                 format: csv
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - integration-csit-run-postscript
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
@@ -447,8 +447,8 @@
                 exclude: '{10-exclude-value}'
                 format: csv
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - integration-csit-run-postscript
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-csit-verify-3node-{functionality}'
@@ -534,8 +534,8 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - integration-csit-run-postscript
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-csit-3node-{functionality}-{install}-{stream}'
@@ -643,8 +643,8 @@
                 display-table: true
                 format: csv
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - integration-csit-run-postscript
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-csit-3node-docker-{functionality}-{install}-{stream}'
@@ -754,8 +754,8 @@
                 display-table: true
                 format: csv
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - integration-csit-run-postscript
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
@@ -977,8 +977,8 @@
                 exclude: '{10-exclude-value}'
                 format: csv
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - integration-csit-run-postscript
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}'
@@ -1007,6 +1007,8 @@
           bundle-url: '{bundle-url}'
       - integration-controller-features:
           controller-features: '{install-features}'
+      - integration-controller-debug-map:
+          controller-debug-map: '{debug-map}'
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-test-plan:
@@ -1129,16 +1131,20 @@
       - timed: '{schedule}'
 
     builders:
-      - integration-infra-stack-3-type:
+      - integration-infra-stack-4-type:
+          stack-template: '{stack-template}'
           vm_0_count: '{odl_system_count}'
           vm_0_flavor: '{odl_system_flavor}'
           vm_0_image: '{odl_system_image}'
           vm_1_count: '{openstack_system_count}'
           vm_1_flavor: '{openstack_system_flavor}'
           vm_1_image: '{openstack_system_image}'
-          vm_2_count: '{tools_system_count}'
-          vm_2_flavor: '{tools_system_flavor}'
-          vm_2_image: '{tools_system_image}'
+          vm_2_count: '{openstack_system2_count}'
+          vm_2_flavor: '{openstack_system2_flavor}'
+          vm_2_image: '{openstack_system2_image}'
+          vm_3_count: '{tools_system_count}'
+          vm_3_flavor: '{tools_system_flavor}'
+          vm_3_image: '{tools_system_image}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -1158,8 +1164,8 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - integration-csit-run-postscript
+      - lf-infra-publish
 
 - job-template:
     name: '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
@@ -1188,6 +1194,8 @@
           bundle-url: '{bundle-url}'
       - integration-controller-features:
           controller-features: '{install-features}'
+      - integration-controller-debug-map:
+          controller-debug-map: '{debug-map}'
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-test-plan:
@@ -1315,7 +1323,7 @@
       - timed: '{schedule}'
 
     builders:
-      - integration-infra-stack:
+      - integration-infra-stack-3-type:
           stack-template: '{stack-template}'
           vm_0_count: '{odl_system_count}'
           vm_0_flavor: '{odl_system_flavor}'
@@ -1323,6 +1331,9 @@
           vm_1_count: '{openstack_system_count}'
           vm_1_flavor: '{openstack_system_flavor}'
           vm_1_image: '{openstack_system_image}'
+          vm_2_count: '{openstack_system2_count}'
+          vm_2_flavor: '{openstack_system2_flavor}'
+          vm_2_image: '{openstack_system2_image}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
@@ -1342,8 +1353,8 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
       - integration-csit-archive-build
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - integration-csit-run-postscript
+      - lf-infra-publish
 
 # Template: {project}-patch-test-{stream}
 # Goal: Build a patch and run project specific system test on a distribution containing the change
@@ -1372,7 +1383,7 @@
       - integration-distribution-branch:
           branch: '{branch}'
       - distribution-karaf-version:
-          karaf-version: 'karaf3'
+          karaf-version: '{karaf-version}'
       - integration-distribution-git-url:
           git-url: '{git-url}'
       - string:
@@ -1431,7 +1442,7 @@
             - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
           settings: integration-settings
           settings-type: cfp
-          global-settings: odl-global-settings
+          global-settings: global-settings
           global-settings-type: cfp
       - maven-target:
           maven-version: mvn33
@@ -1445,7 +1456,7 @@
             - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
           settings: integration-settings
           settings-type: cfp
-          global-settings: odl-global-settings
+          global-settings: global-settings
           global-settings-type: cfp
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml