Fix indent for scm, triggers and publisher sub-sections

[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 e4f98bb49184360bd6c6aeaf241c7b9d5a4f9806..2db994f3656dd1486959d04b8b1b29ed2420a178 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -16,6 +16,8 @@
             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},
@@ -28,22 +30,22 @@
                 nemo-csit-1node-engine-only-{stream},
                 netvirt-csit-1node-openstack-basic-only-{stream},
                 netvirt-csit-1node-openstack-basic-all-{stream},
+                netvirt-csit-1node-openstack-mitaka-openstack-{stream},
+                netvirt-vpnservice-csit-1node-openstack-mitaka-openstack-{stream},
                 netvirt-csit-3node-clustering-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-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},
+                ovsdb-csit-3node-clustering-only-{stream},
                 packetcable-csit-1node-pcmm-only-{stream},
                 packetcable-csit-1node-pcmm-all-{stream},
                 sxp-csit-1node-basic-only-{stream},
@@ -53,11 +55,10 @@
                 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},
-                tsdr-csit-1node-cassandra-datastore-all-{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},
                 usc-csit-1node-tcp-only-{stream},
@@ -71,6 +72,8 @@
             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},
@@ -83,22 +86,22 @@
                 nemo-csit-1node-engine-only-{stream},
                 netvirt-csit-1node-openstack-basic-only-{stream},
                 netvirt-csit-1node-openstack-basic-all-{stream},
+                netvirt-csit-1node-openstack-mitaka-openstack-{stream},
+                netvirt-vpnservice-csit-1node-openstack-mitaka-openstack-{stream},
                 netvirt-csit-3node-clustering-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-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},
+                ovsdb-csit-3node-clustering-only-{stream},
                 packetcable-csit-1node-pcmm-only-{stream},
                 packetcable-csit-1node-pcmm-all-{stream},
                 sxp-csit-1node-basic-only-{stream},
@@ -146,14 +149,11 @@
                 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},
+                openflowplugin-csit-3node-clustering-only-{stream},
                 ovsdb-csit-1node-southbound-all-{stream},
                 ovsdb-csit-1node-southbound-only-{stream},
                 packetcable-csit-1node-pcmm-only-{stream},
@@ -176,52 +176,6 @@
                 vtn-csit-1node-manager-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},
-                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-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-all-only-{stream},
-                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},
-                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},
-                ovsdb-csit-1node-southbound-all-{stream},
-                snmp-csit-1node-basic-only-{stream},
-                snmp-csit-1node-basic-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-li-only-{stream},
-                vtn-csit-1node-manager-li-all-{stream},
-                vtn-csit-1node-coordinator-only-{stream}
-
 
 # Template: integration-csit-verify-1node-library
 # Goal: Verify changes in csit folder not covered by projects suite verify jobs (e.g. libraries or variables)
@@ -246,9 +200,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:
@@ -263,14 +217,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:
@@ -315,7 +268,7 @@
         - email-notification:
             email-prefix: '[integration]'
         - integration-csit-archive-build
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
 
 # Template: integration-distribution-test-{stream}
@@ -452,7 +405,7 @@
                   BUNDLEURL=$BUNDLEURL
 
     publishers:
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
         - email-notification:
             email-prefix: '[$GERRIT_PROJECT]'
@@ -520,7 +473,7 @@
                   BUNDLEURL=$BUNDLEURL
 
     publishers:
-        - archive-build:
+        - opendaylight-infra-shiplogs:
             maven-version: '{mvn33}'
         - email-notification:
             email-prefix: '[int/dist]'