Merge "Move netvirt jobs to netvirt"

[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 f31f7c696420696ac4661ede270e4b5d09735b66..ac2f68c81190bb79063daf079b2bff52420eb7c5 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -63,7 +63,9 @@
                 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},
@@ -125,7 +127,9 @@
                 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},
@@ -217,7 +221,7 @@
                 odl-bgpcep-bgp,
                 odl-netconf-connector-all
         - integration-test-options:
-            test-options: '-e adsal -v TIMEOUT_BUG_4220:10s'
+            test-options: '-v TIMEOUT_BUG_4220:10s'
         - integration-stream-test-plan:
             stream-test-plan: 'test-libraries-beryllium.txt'
         - integration-test-plan:
@@ -330,9 +334,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'