Remove lithium jobs

[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 327257c3f42a3f426946632cc738d505d74fbc4e..205314d55062cf9da5cb71a86b55afc3ab0cf743 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -11,11 +11,13 @@
     project-name: integration-test
 
     stream:
-        - boron:
+        - carbon:
             branch: 'master'
             jdk: 'openjdk8'
             jre: 'openjdk8'
             csit-list: >
+                controller-csit-3node-clustering-only-{stream},
+                controller-csit-3node-clustering-all-{stream},
                 integration-distribution-deploy-{stream},
                 integration-distribution-offline-{stream},
                 l2switch-csit-1node-switch-only-{stream},
@@ -34,14 +36,11 @@
                 ocpplugin-csit-1node-scalability-only-{stream},
                 ocpplugin-csit-1node-scalability-all-{stream},
                 openflowplugin-csit-1node-flow-services-only-{stream},
-                openflowplugin-csit-1node-flow-services-helium-redesign-only-{stream},
                 openflowplugin-csit-1node-flow-services-all-{stream},
                 openflowplugin-csit-1node-scalability-only-{stream},
-                openflowplugin-csit-1node-scalability-helium-redesign-only-{stream},
                 openflowplugin-csit-1node-cbench-performance-only-{stream},
-                openflowplugin-csit-1node-cbench-performance-helium-redesign-only-{stream},
                 openflowplugin-csit-1node-config-performance-only-{stream},
-                openflowplugin-csit-1node-config-performance-helium-redesign-only-{stream},
+                openflowplugin-csit-3node-clustering-only-{stream},
                 ovsdb-csit-1node-southbound-all-{stream},
                 ovsdb-csit-1node-southbound-only-{stream},
                 packetcable-csit-1node-pcmm-only-{stream},
@@ -53,7 +52,9 @@
                 topoprocessing-csit-1node-topology-operations-all-{stream},
                 topoprocessing-csit-1node-topology-operations-only-{stream},
                 tsdr-csit-1node-cassandra-datastore-only-{stream},
+                tsdr-csit-1node-hbase-datastore-all-{stream},
                 tsdr-csit-1node-hbase-datastore-only-{stream},
+                tsdr-csit-1node-hsqldb-datastore-all-{stream},
                 tsdr-csit-1node-hsqldb-datastore-only-{stream},
                 usc-csit-1node-channel-only-{stream},
                 usc-csit-1node-channel-all-{stream},
@@ -63,51 +64,44 @@
                 vtn-csit-1node-manager-all-{stream},
                 vtn-csit-1node-coordinator-only-{stream}
 
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: 'openjdk7'
-            jre: 'openjdk7'
+        - boron:
+            branch: 'stable/boron'
+            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},
-                integration-distribution-offline-{stream},
+                controller-csit-3node-clustering-only-{stream},
+                controller-csit-3node-clustering-all-{stream},
                 integration-distribution-deploy-{stream},
+                integration-distribution-offline-{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},
                 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},
+                ocpplugin-csit-1node-get-only-{stream},
+                ocpplugin-csit-1node-get-all-{stream},
+                ocpplugin-csit-1node-scalability-only-{stream},
+                ocpplugin-csit-1node-scalability-all-{stream},
                 openflowplugin-csit-1node-flow-services-only-{stream},
-                openflowplugin-csit-1node-flow-services-lithium-redesign-only-{stream},
                 openflowplugin-csit-1node-flow-services-all-{stream},
                 openflowplugin-csit-1node-scalability-only-{stream},
-                openflowplugin-csit-1node-scalability-lithium-redesign-only-{stream},
                 openflowplugin-csit-1node-cbench-performance-only-{stream},
-                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-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},
-                snmp-csit-1node-basic-only-{stream},
-                snmp-csit-1node-basic-all-{stream},
                 sxp-csit-1node-basic-only-{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-cassandra-datastore-only-{stream},
@@ -121,8 +115,8 @@
                 vtn-csit-1node-manager-all-{stream},
                 vtn-csit-1node-coordinator-only-{stream}
 
-        - stable-lithium:
-            branch: 'stable/lithium'
+        - beryllium:
+            branch: 'stable/beryllium'
             jdk: 'openjdk7'
             jre: 'openjdk7'
             csit-list: >
@@ -132,39 +126,48 @@
                 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-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-all-only-{stream},
-                lispflowmapping-csit-1node-all-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},
                 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},
-                openflowplugin-csit-1node-flow-services-lithium-redesign-only-{stream},
                 openflowplugin-csit-1node-flow-services-all-{stream},
                 openflowplugin-csit-1node-scalability-only-{stream},
-                openflowplugin-csit-1node-scalability-lithium-redesign-only-{stream},
                 openflowplugin-csit-1node-cbench-performance-only-{stream},
-                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-southbound-only-{stream},
+                openflowplugin-csit-3node-clustering-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},
                 snmp-csit-1node-basic-only-{stream},
                 snmp-csit-1node-basic-all-{stream},
+                sxp-csit-1node-basic-only-{stream},
+                sxp-csit-1node-filtering-only-{stream},
+                sxp-csit-1node-filtering-all-{stream},
+                topoprocessing-csit-1node-topology-operations-all-{stream},
+                topoprocessing-csit-1node-topology-operations-only-{stream},
+                tsdr-csit-1node-cassandra-datastore-only-{stream},
+                tsdr-csit-1node-hbase-datastore-only-{stream},
+                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-li-only-{stream},
-                vtn-csit-1node-manager-li-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}
 
 
@@ -191,9 +194,9 @@
             refspec: 'refs/heads/{branch}'
             artifacts: '{archive-artifacts}'
         - integration-branch:
-            branch: 'stable/beryllium'
+            branch: 'stable/boron'
         - integration-distribution-stream:
-            stream: 'beryllium'
+            stream: 'boron'
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-controller-scope:
@@ -208,14 +211,13 @@
         - integration-test-options:
             test-options: '-v TIMEOUT_BUG_4220:10s'
         - integration-stream-test-plan:
-            stream-test-plan: 'test-libraries-beryllium.txt'
+            stream-test-plan: 'test-libraries-boron.txt'
         - 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.
+            jdkversion: 'openjdk8'
 
     scm:
         - integration-gerrit-scm:
@@ -226,7 +228,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}'
@@ -260,7 +262,7 @@
         - email-notification:
             email-prefix: '[integration]'
         - integration-csit-archive-build
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 # Template: integration-distribution-test-{stream}
@@ -397,7 +399,7 @@
                   BUNDLEURL=$BUNDLEURL
 
     publishers:
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
         - email-notification:
             email-prefix: '[$GERRIT_PROJECT]'
@@ -465,7 +467,7 @@
                   BUNDLEURL=$BUNDLEURL
 
     publishers:
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
         - email-notification:
             email-prefix: '[int/dist]'