Merge "Update csit to stable/lithium"

diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily-master.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
similarity index 87%
rename from jjb/l2switch/l2switch-csit-host-scalability-daily-master.yaml
rename to jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
index e666679147bf54905a727354ce80ececcdf0ef89..d051cbbaf748f478f66afdb9d46c079f098376bb 100644 (file)
--- a/jjb/l2switch/l2switch-csit-host-scalability-daily-master.yaml
+++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: l2switch-csit-host-scalability-daily-master
+    name: l2switch-csit-host-scalability-daily
     jobs:
         - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
 
@@ -13,6 +13,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/l2switch/l2switch-csit-scalability-master.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml
similarity index 89%
rename from jjb/l2switch/l2switch-csit-scalability-master.yaml
rename to jjb/l2switch/l2switch-csit-scalability.yaml
index d58bb630a94edc4e26c7f875ecefe0bc2458739c..6319e6d4ef037ecb3f5fefddd76e9dd279a91a73 100644 (file)
--- a/jjb/l2switch/l2switch-csit-scalability-master.yaml
+++ b/jjb/l2switch/l2switch-csit-scalability.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: l2switch-csit-scalability-master
+    name: l2switch-csit-scalability
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/l2switch/l2switch-csit-switch-master.yaml b/jjb/l2switch/l2switch-csit-switch.yaml
similarity index 89%
rename from jjb/l2switch/l2switch-csit-switch-master.yaml
rename to jjb/l2switch/l2switch-csit-switch.yaml
index 8de156ee3bdfcd59393c47c1bbefec4771002b10..0b162eedaeb2ce617291bd52f157383862554bd2 100644 (file)
--- a/jjb/l2switch/l2switch-csit-switch-master.yaml
+++ b/jjb/l2switch/l2switch-csit-switch.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: l2switch-csit-switch-master
+    name: l2switch-csit-switch
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-all-master.yaml b/jjb/lispflowmapping/lispflowmapping-csit-all.yaml
similarity index 89%
rename from jjb/lispflowmapping/lispflowmapping-csit-all-master.yaml
rename to jjb/lispflowmapping/lispflowmapping-csit-all.yaml
index 535a8126a3612865953f976da5e8741c22d48f1e..11545965b2ddea84bc76d82273652aaf6c2348c1 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-all-master.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-all.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: lispflowmapping-csit-all-master
+    name: lispflowmapping-csit-all
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-master.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
similarity index 89%
rename from jjb/openflowplugin/openflowplugin-csit-cbench-daily-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
index b44a1f45d3ee956c2156e4096e3a58bbbcd934d4..af4f6ceb50129085e50e0a0cf2c0c54802d137ea 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily-master.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-cbench-daily-master
+    name: openflowplugin-csit-cbench-daily
     jobs:
         - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
 
@@ -13,6 +13,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-master.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
similarity index 90%
rename from jjb/openflowplugin/openflowplugin-csit-cbench-performance-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
index d9afacbf63cef0598c8173ed046100be728a5fcd..f8ad74192869134d0eea2114704d3d9a4222d6ac 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-master.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-cbench-performance-master
+    name: openflowplugin-csit-cbench-performance
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
 
@@ -13,6 +13,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-master.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
similarity index 88%
rename from jjb/openflowplugin/openflowplugin-csit-config-performance-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
index 97629e639ff3ce311258e4925a62a1d7dd0fff68..2b0284ab07b08d4d8b054fc091ebf445923d5df3 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-config-performance-master.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-config-performance-master
+    name: openflowplugin-csit-config-performance
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
 
@@ -13,6 +13,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-more-master.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml
similarity index 81%
rename from jjb/openflowplugin/openflowplugin-csit-flow-services-more-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml
index 986c54e9b26c02bf525ef58e744f1045da6af32c..5395c553e89c7ce7ca38e005f3c021b9bf66f315 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-more-master.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-more.yaml
@@ -1,7 +1,8 @@
 - project:
-    name: openflowplugin-csit-flow-services-more-master
+    name: openflowplugin-csit-flow-services-more
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
 
     # The project name
     project: 'openflowplugin'
@@ -13,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-master.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
similarity index 88%
rename from jjb/openflowplugin/openflowplugin-csit-flow-services-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 0701f1424a7630b01c17476b9e958299b9c9c7a9..9f2539ee8e5ffd501a0a3d6f465c9c8c5d67b0c4 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-flow-services-master.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-flow-services-master
+    name: openflowplugin-csit-flow-services
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-master.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
similarity index 87%
rename from jjb/openflowplugin/openflowplugin-csit-scalability-daily-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
index 9ba223c3c2d40db5e39297c5e1ade186ce6250df..bc8d2de8a0c4d78be600d9a42b63800ba987bf10 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-master.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-scalability-daily-master
+    name: openflowplugin-csit-scalability-daily
     jobs:
         - '{project}-csit-periodic-1node-cds-{functionality}-{install}-{stream}'
 
@@ -13,6 +13,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-master.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
similarity index 88%
rename from jjb/openflowplugin/openflowplugin-csit-scalability-master.yaml
rename to jjb/openflowplugin/openflowplugin-csit-scalability.yaml
index d28c8aa6865599d05919b14da56ec54a72b75bcc..664e6fe217e6d53143e506acaa66c36d77c0189c 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scalability-master.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: openflowplugin-csit-scalability-master
+    name: openflowplugin-csit-scalability
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/tsdr/tsdr-csit-tsdr-h2-master.yaml b/jjb/tsdr/tsdr-csit-tsdr-h2-master.yaml
new file mode 100644 (file)
index 0000000..0f7db08
--- /dev/null
+++ b/jjb/tsdr/tsdr-csit-tsdr-h2-master.yaml
@@ -0,0 +1,32 @@
+- project:
+    name: tsdr-csit-tsdr-h2
+    jobs:
+        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
+        - '{project}-csit-verify-{functionality}-{stream}'
+
+    # The project name
+    project: 'tsdr'
+
+    # The functionality under test to verify
+    functionality: 'h2-datastore'
+
+    # Project branches
+    stream:
+        - master:
+            branch: 'master'
+
+    install:
+        - only:
+            scope: 'only'
+        - all:
+            scope: 'all'
+
+    # Features to install
+    install-features: 'odl-restconf,odl-tsdr-all'
+
+    # Robot custom options
+    robot-options: ' '
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},openflowjava-distribution-{stream},openflowplugin-distribution-{stream},tsdr-distribution-{stream}'
+

diff --git a/jjb/tsdr/tsdr-csit-tsdr-master.yaml b/jjb/tsdr/tsdr-csit-tsdr.yaml
similarity index 90%
rename from jjb/tsdr/tsdr-csit-tsdr-master.yaml
rename to jjb/tsdr/tsdr-csit-tsdr.yaml
index 6b31940e2238c4a9c14d30a79b12e116d9193347..93f2f3b5e381ccdd99c7fe8656ed0720e435826e 100644 (file)
--- a/jjb/tsdr/tsdr-csit-tsdr-master.yaml
+++ b/jjb/tsdr/tsdr-csit-tsdr.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: tsdr-csit-tsdr-master
+    name: tsdr-csit-tsdr
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/usc/usc-csit-channel-master.yaml b/jjb/usc/usc-csit-channel.yaml
similarity index 89%
rename from jjb/usc/usc-csit-channel-master.yaml
rename to jjb/usc/usc-csit-channel.yaml
index 9ceeeabc2cdb859059237f0f0baf6b54043d83fd..89b907b50dc84836c027f52dd2561d6299acad69 100644 (file)
--- a/jjb/usc/usc-csit-channel-master.yaml
+++ b/jjb/usc/usc-csit-channel.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: usc-csit-channel-master
+    name: usc-csit-channel
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/vpnservice/vpnservice-csit-vpnservice-master.yaml b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
similarity index 88%
rename from jjb/vpnservice/vpnservice-csit-vpnservice-master.yaml
rename to jjb/vpnservice/vpnservice-csit-vpnservice.yaml
index c92e5d4edbcd38878f723814848ef19f4922ca3f..db226cd245b828a999b5e13d56f23400a7f59ccb 100644 (file)
--- a/jjb/vpnservice/vpnservice-csit-vpnservice-master.yaml
+++ b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: vpnservice-csit-vpnservice-master
+    name: vpnservice-csit-vpnservice
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only:

diff --git a/jjb/vtn/vtn-csit-manager-master.yaml b/jjb/vtn/vtn-csit-manager.yaml
similarity index 90%
rename from jjb/vtn/vtn-csit-manager-master.yaml
rename to jjb/vtn/vtn-csit-manager.yaml
index 81643c3d92b813c5fce015d85a998b5b9ea87c6b..b12b79106c2a3fb608d665a6f403fbba462c651d 100644 (file)
--- a/jjb/vtn/vtn-csit-manager-master.yaml
+++ b/jjb/vtn/vtn-csit-manager.yaml
@@ -1,5 +1,5 @@
 - project:
-    name: vtn-csit-manager-master
+    name: vtn-csit-manager
     jobs:
         - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
         - '{project}-csit-verify-{functionality}-{stream}'
@@ -14,6 +14,8 @@
     stream:
         - master:
             branch: 'master'
+        - stable-lithium:
+            branch: 'stable/lithium'
 
     install:
         - only: