Unify maven goal options some more

[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 cd52311107e1d07d21fe6bec5d27e54f307d4733..9344513af61c4707bff68b89c2e4eae7c98ca54a 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -15,13 +15,6 @@
             jdk: 'openjdk8'
             jre: 'openjdk8'
             csit-list: >
-                aaa-csit-1node-authn-only-{stream},
-                aaa-csit-1node-authn-all-{stream},
-                bgpcep-csit-1node-userfeatures-only-{stream},
-                bgpcep-csit-1node-userfeatures-all-{stream},
-                capwap-csit-1node-ac-only-{stream},
-                capwap-csit-1node-ac-all-{stream},
-                controller-csit-3node-clustering-only-{stream},
                 integration-distribution-deploy-{stream},
                 integration-distribution-offline-{stream},
                 l2switch-csit-1node-switch-only-{stream},
@@ -32,10 +25,9 @@
                 lispflowmapping-csit-1node-msmr-all-{stream},
                 nemo-csit-1node-engine-all-{stream},
                 nemo-csit-1node-engine-only-{stream},
-                netconf-csit-1node-userfeatures-all-{stream},
-                netconf-csit-1node-userfeatures-only-{stream},
-                nic-csit-1node-basic-all-{stream},
-                nic-csit-1node-basic-only-{stream},
+                netvirt-csit-1node-openstack-basic-only-{stream},
+                netvirt-csit-1node-openstack-basic-all-{stream},
+                netvirt-csit-3node-clustering-only-{stream},
                 openflowplugin-csit-1node-flow-services-only-{stream},
                 openflowplugin-csit-1node-flow-services-lithium-redesign-only-{stream},
                 openflowplugin-csit-1node-flow-services-all-{stream},
@@ -46,18 +38,11 @@
                 openflowplugin-csit-1node-cbench-performance-lithium-redesign-only-{stream},
                 openflowplugin-csit-1node-config-performance-only-{stream},
                 openflowplugin-csit-1node-config-performance-lithium-redesign-only-{stream},
-                openflowplugin-csit-3node-clustering-helium-design-only-{stream},
-                openflowplugin-csit-3node-clustering-only-{stream},
-                ovsdb-csit-3node-clustering-only-{stream},
-                ovsdb-csit-1node-netvirt-only-{stream},
-                ovsdb-csit-1node-netvirt-all-{stream},
-                ovsdb-csit-1node-southbound-only-{stream},
                 ovsdb-csit-1node-southbound-all-{stream},
+                ovsdb-csit-1node-southbound-only-{stream},
                 packetcable-csit-1node-pcmm-only-{stream},
                 packetcable-csit-1node-pcmm-all-{stream},
                 sxp-csit-1node-basic-only-{stream},
-                sxp-csit-1node-basic-all-{stream},
-                sxp-csit-1node-filtering-only-{stream},
                 sxp-csit-1node-filtering-all-{stream},
                 sxp-csit-1node-topology-only-{stream},
                 sxp-csit-1node-topology-all-{stream},
@@ -68,9 +53,10 @@
                 tsdr-csit-1node-hsqldb-datastore-only-{stream},
                 usc-csit-1node-channel-only-{stream},
                 usc-csit-1node-channel-all-{stream},
-                vpnservice-csit-1node-vpnservice-only-{stream},
-                vpnservice-csit-1node-vpnservice-all-{stream},
-                vtn-csit-1node-manager-only-{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}
 
         - beryllium:
             branch: 'stable/beryllium'
@@ -94,6 +80,9 @@
                 nemo-csit-1node-engine-only-{stream},
                 netconf-csit-1node-userfeatures-all-{stream},
                 netconf-csit-1node-userfeatures-only-{stream},
+                netvirt-csit-1node-openstack-basic-only-{stream},
+                netvirt-csit-1node-openstack-basic-all-{stream},
+                netvirt-csit-3node-clustering-only-{stream},
                 nic-csit-1node-basic-all-{stream},
                 nic-csit-1node-basic-only-{stream},
                 openflowplugin-csit-1node-flow-services-only-{stream},
@@ -106,8 +95,8 @@
                 openflowplugin-csit-1node-cbench-performance-lithium-redesign-only-{stream},
                 openflowplugin-csit-1node-config-performance-only-{stream},
                 openflowplugin-csit-1node-config-performance-lithium-redesign-only-{stream},
-                ovsdb-csit-1node-netvirt-only-{stream},
-                ovsdb-csit-1node-netvirt-all-{stream},
+                ovsdb-csit-1node-southbound-all-{stream},
+                ovsdb-csit-1node-southbound-only-{stream},
                 packetcable-csit-1node-pcmm-only-{stream},
                 packetcable-csit-1node-pcmm-all-{stream},
                 snmp-csit-1node-basic-only-{stream},
@@ -122,6 +111,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}
@@ -147,6 +138,8 @@
                 lispflowmapping-csit-1node-all-all-{stream},
                 netconf-csit-1node-userfeatures-all-{stream},
                 netconf-csit-1node-userfeatures-only-{stream},
+                netvirt-csit-1node-openstack-basic-only-{stream},
+                netvirt-csit-1node-openstack-basic-all-{stream},
                 nic-csit-1node-basic-all-{stream},
                 nic-csit-1node-basic-only-{stream},
                 openflowplugin-csit-1node-flow-services-only-{stream},
@@ -159,8 +152,6 @@
                 openflowplugin-csit-1node-cbench-performance-lithium-redesign-only-{stream},
                 openflowplugin-csit-1node-config-performance-only-{stream},
                 openflowplugin-csit-1node-config-performance-lithium-redesign-only-{stream},
-                ovsdb-csit-1node-netvirt-only-{stream},
-                ovsdb-csit-1node-netvirt-all-{stream},
                 ovsdb-csit-1node-southbound-only-{stream},
                 ovsdb-csit-1node-southbound-all-{stream},
                 snmp-csit-1node-basic-only-{stream},
@@ -372,22 +363,25 @@
         - inject:
             properties-file: 'bundle.txt'
         - wipe-org-opendaylight-repo
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{integration-settings}'
         - maven-target:
             maven-version: '{mvn33}'
             pom: '$GERRIT_PROJECT/pom.xml'
-            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}'
+            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}'
             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'
+        goals: 'clean install -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}'
         global-settings: '{odl-global-settings}'
+        settings: '{integration-settings}'
         ignore-upstream-changes: true
         post-step-run-condition: 'SUCCESS'
 
@@ -442,15 +436,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}'
+        # TODO: Make Maven options configurable. Currently tests are not skipped, everything else is.
+        goals: 'clean install -f patch_tester/pom.xml -V -B -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: