Merge "Remove Li redesign -all- test"

[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 f627a8ca37de8b4dbae808bfba1f9255e1c51d56..39d2baa0d80dd24af86f834901a56916a5196a7c 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -34,11 +34,15 @@
                 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-scalability-all-{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-netvirt-only-{stream},
                 ovsdb-csit-1node-netvirt-all-{stream},
                 ovsdb-csit-1node-southbound-only-{stream},
@@ -81,11 +85,15 @@
                 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-scalability-all-{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-netvirt-only-{stream},
                 ovsdb-csit-1node-netvirt-all-{stream},
                 ovsdb-csit-1node-southbound-only-{stream},
@@ -210,17 +218,19 @@
         - integration-controller-scope:
             controller-scope: 'only'
         - integration-controller-features:
-            controller-features: 'odl-openflowplugin-flow-services-ui'
+            controller-features: 'odl-openflowplugin-flow-services-ui,odl-bgpcep-pcep-all,odl-bgpcep-bgp-all,odl-bgpcep-bgp,odl-bgpcep-pcep,odl-netconf-connector-all'
         - integration-test-options:
             test-options: '-e adsal'
         - integration-test-plan:
-            test-plan: 'openflowplugin-flow-services.txt'
+            test-plan: 'test-libraries.txt'
+        - integration-patch-refspec:
+            branch: '$GERRIT_REFSPEC'
 
     scm:
         - integration-gerrit-scm:
             credentials-id: '{ssh-credentials}'
             basedir: 'test'
-            refspec: '$GERRIT_REFSPEC'
+            refspec: '$PATCHREFSPEC'
             branch: 'master'
 
     wrappers: