Switch the csit-1node to use job prefix

[releng/builder.git] / jjb / alto / alto-csit-setup.yaml

diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml
index 4170987e35dc689a69901a11ba83a583f6837a7c..172f7506b37af3e19340f8b80094ba3f09d00698 100644 (file)
--- a/jjb/alto/alto-csit-setup.yaml
+++ b/jjb/alto/alto-csit-setup.yaml
@@ -1,7 +1,8 @@
+---
 - project:
     name: alto-csit-setup
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'alto'
@@ -11,21 +12,17 @@
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+      - oxygen:
+          branch: 'master'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
 
     # Features to install
     install-features: 'odl-alto-resourcepool,odl-restconf-all,odl-alto-basic'
@@ -33,8 +30,5 @@
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'alto-distribution-{stream}'
-
     # Don't spin up mininet vms as alto-csit-setup jobs don't need them
     tools_system_count: 0