Merge "Update csit for stable/lithium"

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/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: