X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-test-jobs.yaml;h=3d84b991499767293fecfdac844113b919fbc5e1;hb=5a6ea423022e8d3e663097d510513dde2a56b7e9;hp=b01bd7a6a59f1edae87f2340bf70df83918c1773;hpb=f06e45af9aef51a76af4baf71bfd865f038db2ae;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index b01bd7a6a..3d84b9914 100644
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -11,7 +11,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: 'openjdk7'
+            jdk: 'openjdk8'
+            jre: 'openjdk8'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
                 aaa-csit-1node-authn-all-{stream},
@@ -20,9 +21,8 @@
                 capwap-csit-1node-ac-only-{stream},
                 capwap-csit-1node-ac-all-{stream},
                 controller-csit-3node-clustering-only-{stream},
-                controller-csit-3node-clustering-all-{stream},
                 integration-csit-3node-basic-only-{stream},
-                integration-csit-3node-basic-all-{stream},
+                integration-distribution-deploy-{stream},
                 integration-distribution-offline-{stream},
                 l2switch-csit-1node-switch-only-{stream},
                 l2switch-csit-1node-switch-all-{stream},
@@ -30,6 +30,10 @@
                 l2switch-csit-1node-scalability-all-{stream},
                 lispflowmapping-csit-1node-msmr-only-{stream},
                 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},
                 openflowplugin-csit-1node-flow-services-only-{stream},
@@ -42,28 +46,36 @@
                 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},
+                packetcable-csit-1node-pcmm-only-{stream},
+                packetcable-csit-1node-pcmm-all-{stream},
                 snmp-csit-1node-basic-only-{stream},
                 snmp-csit-1node-basic-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},
                 topoprocessing-csit-1node-topology-operations-all-{stream},
                 topoprocessing-csit-1node-topology-operations-only-{stream},
-                tsdr-csit-1node-h2-datastore-only-{stream},
-                tsdr-csit-1node-h2-datastore-all-{stream},
                 tsdr-csit-1node-hbase-datastore-only-{stream},
-                tsdr-csit-1node-hbase-datastore-all-{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},
-                vtn-csit-1node-manager-all-{stream}
+                vtn-csit-1node-manager-only-{stream}
 
         - beryllium:
             branch: 'stable/beryllium'
             jdk: 'openjdk7'
+            jre: 'openjdk7'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
                 aaa-csit-1node-authn-all-{stream},
@@ -72,16 +84,19 @@
                 capwap-csit-1node-ac-only-{stream},
                 capwap-csit-1node-ac-all-{stream},
                 controller-csit-3node-clustering-only-{stream},
-                controller-csit-3node-clustering-all-{stream},
                 integration-csit-3node-basic-only-{stream},
-                integration-csit-3node-basic-all-{stream},
                 integration-distribution-offline-{stream},
+                integration-distribution-deploy-{stream},
                 l2switch-csit-1node-switch-only-{stream},
                 l2switch-csit-1node-switch-all-{stream},
                 l2switch-csit-1node-scalability-only-{stream},
                 l2switch-csit-1node-scalability-all-{stream},
                 lispflowmapping-csit-1node-msmr-only-{stream},
                 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},
                 openflowplugin-csit-1node-flow-services-only-{stream},
@@ -94,30 +109,38 @@
                 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},
+                packetcable-csit-1node-pcmm-only-{stream},
+                packetcable-csit-1node-pcmm-all-{stream},
                 snmp-csit-1node-basic-only-{stream},
                 snmp-csit-1node-basic-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},
                 topoprocessing-csit-1node-topology-operations-all-{stream},
                 topoprocessing-csit-1node-topology-operations-only-{stream},
-                tsdr-csit-1node-h2-datastore-only-{stream},
-                tsdr-csit-1node-h2-datastore-all-{stream},
                 tsdr-csit-1node-hbase-datastore-only-{stream},
-                tsdr-csit-1node-hbase-datastore-all-{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},
                 vtn-csit-1node-manager-all-{stream},
-                vtn-csit-1node-coordinator-only-{stream},
-                vtn-csit-1node-coordinator-all-{stream}
+                vtn-csit-1node-coordinator-only-{stream}
 
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: 'openjdk7'
+            jre: 'openjdk7'
             csit-list: >
                 aaa-csit-1node-authn-only-{stream},
                 aaa-csit-1node-authn-all-{stream},
@@ -134,6 +157,8 @@
                 l2switch-csit-1node-scalability-all-{stream},
                 lispflowmapping-csit-1node-all-only-{stream},
                 lispflowmapping-csit-1node-all-all-{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},
                 openflowplugin-csit-1node-flow-services-only-{stream},
@@ -158,19 +183,18 @@
                 vpnservice-csit-1node-vpnservice-all-{stream},
                 vtn-csit-1node-manager-li-only-{stream},
                 vtn-csit-1node-manager-li-all-{stream},
-                vtn-csit-1node-coordinator-only-{stream},
-                vtn-csit-1node-coordinator-all-{stream}
+                vtn-csit-1node-coordinator-only-{stream}
 
         - stable-helium:
             branch: 'stable/helium'
             jdk: 'openjdk7'
+            jre: 'openjdk7'
             csit-list: >
                 aaa-csit-1node-imds-authn-only-{stream},
                 aaa-csit-1node-imds-authn-all-{stream},
                 controller-csit-1node-imds-nsf-only-{stream},
                 controller-csit-1node-imds-nsf-all-{stream},
                 integration-csit-3node-basic-only-{stream},
-                integration-csit-3node-basic-all-{stream},
                 l2switch-csit-1node-imds-switch-only-{stream},
                 l2switch-csit-1node-imds-switch-all-{stream},
                 lispflowmapping-csit-1node-imds-all-only-{stream},
@@ -264,18 +288,20 @@
             controller-scope: 'only'
         - integration-controller-features:
             controller-features: >
+                odl-clustering-test-app,
                 odl-openflowplugin-flow-services-ui,
                 odl-bgpcep-pcep,
                 odl-bgpcep-bgp,
                 odl-netconf-connector-all
         - integration-test-options:
-            test-options: '-e adsal'
+            test-options: '-e adsal -v TIMEOUT_BUG_4220:10s'
         - integration-test-plan:
             test-plan: 'test-libraries.txt'
         - integration-patch-refspec:
             branch: '$GERRIT_REFSPEC'
         - integration-jdk-version:
             jdkversion: 'openjdk7'
+            # TODO: Switch to openjdk8 from Boron on.
 
     scm:
         - integration-gerrit-scm:
@@ -344,7 +370,7 @@
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jre}'
 
     triggers:
         - timed: 'H H * * 6'
@@ -355,6 +381,7 @@
               block: true
               predefined-parameters:
                   BUNDLEURL=$BUNDLEURL
+                  JDKVERSION=$JDKVERSION
 
     publishers:
         - email-notification: