Merge "ipsec over vxlan tunnel support."

[releng/builder.git] / jjb / releng-defaults.yaml

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 4367a42dae13dba813d70fa7d7046373b0be268b..35a6065173ed4b6e929b0aaff3af975be7198ae8 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -38,6 +38,7 @@
     archive-artifacts: ''
     branch: master
     distribution_branch: '$GERRIT_BRANCH'
+    os-cloud: rackspace
 
     # Distribution bundle URL
     bundleurl: 'last'
@@ -67,8 +68,15 @@
     verify-stream: 'boron'
     verify-jdkversion: 'openjdk8'
 
-    # In case a CSIT job is merged without Java version specified
+    # Maven / Java
     jdk: 'openjdk8'
+    opendaylight-infra-mvn-opts: |
+        --show-version
+        --batch-mode
+        -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+        -Djenkins
+        -Dmaven.repo.local=/tmp/r
+        -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
 
     # Python
     toxdir: ''
@@ -143,6 +151,7 @@
         aaa-csit-1node-idmlite-only-carbon,
         aaa-csit-1node-keystone-all-carbon,
         aaa-csit-1node-keystone-only-carbon,
+        aaa-csit-1node-tls-only-carbon,
         alto-csit-1node-setup-all-carbon,
         alto-csit-1node-setup-only-carbon,
         armoury-csit-1node-basic-all-carbon,
@@ -158,6 +167,8 @@
         bgpcep-csit-3node-periodic-bgpclustering-all-carbon,
         bgpcep-csit-3node-periodic-bgpclustering-ha-only-carbon,
         bgpcep-csit-3node-periodic-bgpclustering-only-carbon,
+        bier-csit-1node-basic-all-carbon,
+        bier-csit-1node-basic-only-carbon,
         capwap-csit-1node-ac-all-carbon,
         capwap-csit-1node-ac-only-carbon,
         centinel-csit-1node-basic-all-carbon,
@@ -316,6 +327,8 @@
         sxp-csit-1node-topology-only-carbon,
         sxp-csit-3node-periodic-clustering-all-carbon,
         sxp-csit-3node-periodic-clustering-only-carbon,
+        sxp-csit-3node-periodic-routing-all-carbon,
+        sxp-csit-3node-periodic-routing-only-carbon,
         topoprocessing-csit-1node-topology-operations-all-carbon,
         topoprocessing-csit-1node-topology-operations-only-carbon,
         tsdr-csit-1node-cassandra-datastore-only-carbon,
@@ -517,7 +530,6 @@
         topoprocessing-csit-1node-topology-operations-all-boron,
         topoprocessing-csit-1node-topology-operations-only-boron,
         tsdr-csit-1node-cassandra-datastore-only-boron,
-        tsdr-csit-1node-elasticsearch-datastore-only-boron,
         tsdr-csit-1node-hbase-datastore-all-boron,
         tsdr-csit-1node-hbase-datastore-only-boron,
         tsdr-csit-1node-hsqldb-datastore-all-boron,
@@ -662,7 +674,6 @@
         topoprocessing-csit-1node-topology-operations-all-beryllium,
         topoprocessing-csit-1node-topology-operations-only-beryllium,
         tsdr-csit-1node-cassandra-datastore-only-beryllium,
-        tsdr-csit-1node-elasticsearch-datastore-only-beryllium,
         tsdr-csit-1node-hbase-datastore-all-beryllium,
         tsdr-csit-1node-hbase-datastore-only-beryllium,
         tsdr-csit-1node-hsqldb-datastore-all-beryllium,