Remove nitrogen branches in projects

[releng/builder.git] / jjb / daexim / daexim-csit-basic.yaml

diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml
index ba2edf7ae6726ce1279dbc420e08271a41af4f3c..1324d4df2d9a97487e36edbcc48b28831719cf48 100644 (file)
--- a/jjb/daexim/daexim-csit-basic.yaml
+++ b/jjb/daexim/daexim-csit-basic.yaml
@@ -1,7 +1,8 @@
+---
 - project:
     name: daexim-csit-basic
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'daexim'
@@ -11,24 +12,20 @@
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-            bundleurl: 'https://jenkins.opendaylight.org/releng/view/daexim/job/daexim-merge-carbon/lastSuccessfulBuild/org.opendaylight.daexim$daexim-karaf/artifact/org.opendaylight.daexim/daexim-karaf/1.0.0-SNAPSHOT/daexim-karaf-1.0.0-SNAPSHOT.zip'
+      - fluorine:
+          branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
 
     install:
-        - only:
-            scope: 'only'
+      - only:
+          scope: 'only'
 
     # no mininet required
-    mininet-vms: 0
+    tools_system_count: 0
 
     # Features to install
     install-features: 'odl-daexim-all,odl-netconf-topology,odl-jolokia'
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'daexim-merge-{stream}'
-