Remove nitrogen branches in projects

[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 3575d937c5ec8ef024ed4822e5fc6e14c98a1459..e3488469e024870ebd399510226791b1b297d638 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,33 +10,24 @@
     # The functionality under test
     functionality: 'akka1'
 
-    # Project branches. Boron for actual testing, Beryllium for sanity.
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
+      - fluorine:
+          branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
 
     # 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}