Merge "Remove Lithium 3node -all- job from csit-list"

diff --git a/jjb/controller/controller-csit-clustering-lithium.yaml b/jjb/controller/controller-csit-clustering-lithium.yaml
new file mode 100644 (file)
index 0000000..26d8263
--- /dev/null
+++ b/jjb/controller/controller-csit-clustering-lithium.yaml
@@ -0,0 +1,33 @@
+- project:
+    name: controller-csit-clustering-lithium
+    jobs:
+        - '{project}-csit-3node-{functionality}-{install}-{stream}'
+
+    # The project name
+    project: 'controller'
+
+    # The functionality under test
+    functionality: 'clustering'
+
+    # Project branches
+    stream:
+        - stable-lithium:
+            branch: 'stable/lithium'
+
+    install:
+        - only:
+            scope: 'only'
+        # Bug 4676 means -all- would fail.
+
+    # Features to install
+    install-features: 'odl-restconf,odl-clustering-test-app,odl-netconf-connector-ssh'
+
+    # Robot custom options
+    robot-options: ''
+
+    # Trigger jobs (upstream dependencies)
+    trigger-jobs: >
+        odlparent-distribution-{stream},
+        yangtools-distribution-{stream},
+        controller-distribution-{stream},
+        integration-distribution-merge-{stream}

diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml
index d0d899a44ffc581de05b9ae070263b71dba97d54..9004ab113adac7643fe61707c8259d245b820461 100644 (file)
--- a/jjb/controller/controller-csit-clustering.yaml
+++ b/jjb/controller/controller-csit-clustering.yaml
@@ -14,12 +14,12 @@
     stream:
         - beryllium:
             branch: 'master'
-        - stable-lithium:
-            branch: 'stable/lithium'
 
     install:
         - only:
             scope: 'only'
+        - all:
+            scope: 'all'
 
     # Features to install
     install-features: 'odl-restconf,odl-clustering-test-app,odl-netconf-connector-ssh'
@@ -28,4 +28,10 @@
     robot-options: ''
 
     # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream}'
+    trigger-jobs: >
+        odlparent-distribution-{stream},
+        yangtools-distribution-{stream},
+        mdsal-distribution-{stream},
+        controller-distribution-{stream},
+        netconf-distribution-{stream},
+        integration-distribution-merge-{stream}

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 4ca9326efc1db5290fce22a5ed4351020f460a06..89b6ddfd5152ccb2918d6c7ae7e80914d3d2f2c8 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -68,9 +68,7 @@
                 capwap-csit-1node-ac-only-{stream},
                 capwap-csit-1node-ac-all-{stream},
                 controller-csit-3node-clustering-only-{stream},
-                controller-csit-3node-clustering-all-{stream},
                 integration-csit-3node-basic-only-{stream},
-                integration-csit-3node-basic-all-{stream},
                 integration-distribution-offline-{stream},
                 l2switch-csit-1node-switch-only-{stream},
                 l2switch-csit-1node-switch-all-{stream},