Merge "remove all csit jobs that do not adhere to system test expectations"

[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 5264d43ae244d9a7432f18d5acf78ad563073f83..cf3d2b87812f3444520415b16892079564c0ce51 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,6 @@
                 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},
                 openflowplugin-csit-1node-flow-services-lithium-redesign-only-{stream},
                 openflowplugin-csit-1node-flow-services-all-{stream},
@@ -46,30 +35,21 @@
                 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-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-only-{stream}
 
         - beryllium:
@@ -83,11 +63,9 @@
                 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-msmr-only-{stream},
@@ -108,30 +86,22 @@
                 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-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-only-{stream},
                 vtn-csit-1node-manager-all-{stream},
                 vtn-csit-1node-coordinator-only-{stream}
@@ -332,9 +302,9 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - gerrit-project-parameter:
+        - gerrit-parameters:
             project: '$GERRIT_PROJECT'
-        - gerrit-refspec-parameter:
+            branch: '{branch}'
             refspec: '$GERRIT_REFSPEC'
         - project-parameter:
             project: '$GERRIT_PROJECT'