Update automated project templates

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

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 9f62cdd93cfb8bde272051e9fd542c6c152a7aa0..ce5d03c0ca30c822ff9f959f406b482c51521647 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -46,6 +46,8 @@
                 tsdr-csit-1node-hsqldb-datastore-only-{stream},
                 usc-csit-1node-channel-only-{stream},
                 usc-csit-1node-channel-all-{stream},
+                usc-csit-1node-tcp-only-{stream},
+                usc-csit-1node-tcp-all-{stream},
                 vtn-csit-1node-manager-only-{stream},
                 vtn-csit-1node-coordinator-only-{stream}
 
@@ -96,6 +98,8 @@
                 tsdr-csit-1node-hsqldb-datastore-only-{stream},
                 usc-csit-1node-channel-only-{stream},
                 usc-csit-1node-channel-all-{stream},
+                usc-csit-1node-tcp-only-{stream},
+                usc-csit-1node-tcp-all-{stream},
                 vtn-csit-1node-manager-only-{stream},
                 vtn-csit-1node-manager-all-{stream},
                 vtn-csit-1node-coordinator-only-{stream}
@@ -355,16 +359,16 @@
             goals: 'clean install -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}'
             global-settings: '{odl-global-settings}'
+            settings: '{integration-settings}'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'distribution/pom.xml'
         goals: 'clean install -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}'
         global-settings: '{odl-global-settings}'
+        settings: '{integration-settings}'
         ignore-upstream-changes: true
         post-step-run-condition: 'SUCCESS'
 
@@ -419,15 +423,14 @@
             global-settings-file: '{odl-global-settings}'
             settings-file: '{yangtools-settings}'
 
-
     maven:
         maven-name: '{mvn33}'
         root-pom: 'patch_tester/pom.xml'
         # TODO: Make Maven option configurable. Currently tests are not skipped, everything elase is.
         goals: 'clean install -f patch_tester/pom.xml -Djenkins -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}'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-        settings: '{yangtools-settings}'
         global-settings: '{odl-global-settings}'
+        settings: '{yangtools-settings}'
         post-step-run-condition: 'SUCCESS'
 
     postbuilders: