Remove all ODL Boron Jobs

[releng/builder.git] / jjb / vtn / vtn-csit-3node-manager.yaml

diff --git a/jjb/vtn/vtn-csit-3node-manager.yaml b/jjb/vtn/vtn-csit-3node-manager.yaml
index 4b11311e878337832e09dfd75c0f65f57cc46c1a..122ae874c977dea5fed8d11e96efb43517e92499 100644 (file)
--- a/jjb/vtn/vtn-csit-3node-manager.yaml
+++ b/jjb/vtn/vtn-csit-3node-manager.yaml
@@ -1,8 +1,9 @@
+---
 - project:
     name: vtn-csit-3node-manager
     jobs:
-        - '{project}-csit-3node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-3node-{functionality}'
+      - '{project}-csit-3node-{functionality}-{install}-{stream}'
+      - '{project}-csit-verify-3node-{functionality}'
 
     # The project name
     project: 'vtn'
@@ -12,18 +13,20 @@
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
+      - oxygen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
 
     # Features to install
     install-features: 'odl-vtn-manager-rest,odl-vtn-manager-neutron'
@@ -31,9 +34,4 @@
     # Robot custom options
     robot-options: ''
 
-    # TODO: Remove mininet-image as it's deprecated in favor of vm_1_image
-    mininet-image: 'ubuntu-trusty-mininet-ovs-25-2c-2g'
-    tools_system_image: 'Ubuntu 14.04 - mininet-ovs-2.5 - 20161031-0804'
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},vtn-distribution-{stream}'
+    tools_system_image: 'Ubuntu 16.04 - mininet-ovs-25 - 20170808-0158'