Switch the csit-1node to use job prefix

[releng/builder.git] / jjb / controller / controller-csit-akka1.yaml

diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml
index 7da6caf1ffd477445ac91a65051c33d4cdd6e0e1..32595905dce3b75971044d7ec8eff05e40f40c50 100644 (file)
--- a/jjb/controller/controller-csit-akka1.yaml
+++ b/jjb/controller/controller-csit-akka1.yaml
@@ -1,7 +1,8 @@
+---
 - project:
     name: controller-csit-akka1
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'controller'
@@ -9,30 +10,27 @@
     # The functionality under test
     functionality: 'akka1'
 
-    # Project branches. Boron for actual testing, Beryllium for sanity.
     stream:
-        - boron:
-            branch: 'master'
-            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'
 
-    # No tools system VMs needed in JCloud configuration
-    mininet-vms: 0
+    # No tools system VMs needed in for this job
+    tools_system_count: 0
 
     # Features to install
-    install-features: 'odl-restconf,odl-clustering-test-app,odl-jolokia'
+    install-features: >
+        odl-restconf,
+        odl-clustering-test-app,
+        odl-jolokia
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: >
-        controller-distribution-{stream}