X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=ce39d849c2a906cb7ab8750f9c434664b7b9ccd3;hb=6a9c5b9776a305a8c8eff9621524f4ed11e6d94e;hp=f96ef155fd36797662780cd4cd8e09db835bb672;hpb=82eed9ac98666e3c31359eab34caffd097c85df4;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index f96ef155f..ce39d849c 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -29,7 +29,7 @@
     disabled: false
 
     project-type: freestyle
-    node: dynamic_robot
+    node: centos7-robot-2c-2g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -72,7 +72,7 @@
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - integration-openstack-controller-mininet:
+        - integration-jclouds-controller-mininet:
             controller-image: '{controller-image}'
             controller-vms: 1
             mininet-image: '{mininet-image}'
@@ -114,7 +114,7 @@
     disabled: false
 
     project-type: freestyle
-    node: dynamic_robot
+    node: centos7-robot-2c-2g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -158,7 +158,7 @@
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - integration-openstack-controller-mininet:
+        - integration-jclouds-controller-mininet:
             controller-image: '{controller-image}'
             controller-vms: 1
             mininet-image: '{mininet-image}'
@@ -194,6 +194,7 @@
             yaxis: '{01-plot-yaxis}'
             group: '{01-plot-group}'
             num-builds: '5400'
+            keep-records: true
             style: line
             use-description: false
             csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
@@ -206,6 +207,7 @@
             yaxis: '{02-plot-yaxis}'
             group: '{02-plot-group}'
             num-builds: '5400'
+            keep-records: true
             style: line
             use-description: false
             csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
@@ -223,7 +225,7 @@
     disabled: false
 
     project-type: freestyle
-    node: dynamic_robot
+    node: centos7-robot-2c-2g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -267,7 +269,7 @@
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - integration-openstack-controller-mininet:
+        - integration-jclouds-controller-mininet:
             controller-image: '{controller-image}'
             controller-vms: 1
             mininet-image: '{mininet-image}'
@@ -302,6 +304,7 @@
             yaxis: '{01-plot-yaxis}'
             group: '{01-plot-group}'
             num-builds: '180'
+            keep-records: true
             style: line
             use-description: false
             csv-file-name: '{project}-csit-periodic-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
@@ -314,6 +317,7 @@
             yaxis: '{02-plot-yaxis}'
             group: '{02-plot-group}'
             num-builds: '180'
+            keep-records: true
             style: line
             use-description: false
             csv-file-name: '{project}-csit-periodic-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
@@ -331,7 +335,7 @@
     disabled: false
 
     project-type: freestyle
-    node: dynamic_robot
+    node: centos7-robot-2c-2g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -374,7 +378,7 @@
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - integration-openstack-controller-mininet:
+        - integration-jclouds-controller-mininet:
             controller-image: '{controller-image}'
             controller-vms: 3
             mininet-image: '{mininet-image}'
@@ -417,7 +421,7 @@
     disabled: false
 
     project-type: freestyle
-    node: dynamic_robot
+    node: centos7-robot-2c-2g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -461,7 +465,7 @@
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - integration-openstack-controller-mininet:
+        - integration-jclouds-controller-mininet:
             controller-image: '{controller-image}'
             controller-vms: 3
             mininet-image: '{mininet-image}'
@@ -498,6 +502,7 @@
             yaxis: '{01-plot-yaxis}'
             group: '{01-plot-group}'
             num-builds: '5400'
+            keep-records: true
             style: line
             use-description: false
             csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
@@ -510,6 +515,7 @@
             yaxis: '{02-plot-yaxis}'
             group: '{02-plot-group}'
             num-builds: '5400'
+            keep-records: true
             style: line
             use-description: false
             csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
@@ -527,7 +533,7 @@
     disabled: false
 
     project-type: freestyle
-    node: dynamic_robot
+    node: centos7-robot-2c-2g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -571,7 +577,7 @@
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - integration-openstack-controller-mininet:
+        - integration-jclouds-controller-mininet:
             controller-image: '{controller-image}'
             controller-vms: 3
             mininet-image: '{mininet-image}'
@@ -607,6 +613,7 @@
             yaxis: '{01-plot-yaxis}'
             group: '{01-plot-group}'
             num-builds: '5400'
+            keep-records: true
             style: line
             use-description: false
             csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
@@ -619,6 +626,7 @@
             yaxis: '{02-plot-yaxis}'
             group: '{02-plot-group}'
             num-builds: '5400'
+            keep-records: true
             style: line
             use-description: false
             csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
@@ -636,7 +644,7 @@
     disabled: false
 
     project-type: freestyle
-    node: dynamic_robot
+    node: centos7-robot-2c-2g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -680,6 +688,10 @@
             name: ODL_ENABLE_L3_FWD
             default: '{odl-enable-l3}'
             description: 'Enable L3 FWD in ODL for createing br-ex'
+        - string:
+            name: PUBLIC_BRIDGE
+            default: '{public-bridge}'
+            description: 'Specifies public bridge for provider and external networking'
         - string:
             name: ENABLE_OS_SERVICES
             default: '{enable-openstack-services}'
@@ -701,7 +713,7 @@
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - integration-openstack-controller-devstack:
+        - integration-jclouds-controller-devstack:
             controller-image: '{controller-image}'
             controller-vms: 1
             openstack-image: '{openstack-image}'
@@ -727,7 +739,7 @@
         - integration-cleanup-tmp
 
     publishers:
-        - integration-robot:
+        - integration-robot-tempest:
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
@@ -741,7 +753,7 @@
     disabled: false
 
     project-type: freestyle
-    node: dynamic_robot
+    node: centos7-robot-2c-2g
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -810,7 +822,7 @@
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'
-        - integration-openstack-controller-devstack:
+        - integration-jclouds-controller-devstack:
             controller-image: '{controller-image}'
             controller-vms: 3
             openstack-image: '{openstack-image}'
@@ -837,7 +849,7 @@
         - integration-cleanup-tmp
 
     publishers:
-        - integration-robot:
+        - integration-robot-tempest:
             unstable-if: 0.0
             pass-if: 100.0
         - email-notification:
@@ -855,7 +867,7 @@
     name: '{project}-patch-test-{stream}'
 
     project-type: maven
-    node: dynamic_verify
+    node: centos7-java-builder-2c-8g
     jdk: '{jdk}'
 
     logrotate:
@@ -916,7 +928,7 @@
         - maven-target:
             maven-version: '{mvn33}'
             pom: '{project}/pom.xml'
-            goals: 'clean install -V -B -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
+            goals: 'clean install dependency:tree -V -B -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.javadoc.skip=true -Dmaven.site.skip=true -DgenerateReports=false -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dstream={stream}'
             java-opts:
                 - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
             settings: 'integration-settings'
@@ -927,7 +939,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'distribution/pom.xml'
-        goals: 'clean install -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install dependency:tree -V -B -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
         settings: 'integration-settings'
         settings-type: cfp