Switch the csit-1node to use job prefix

[releng/builder.git] / jjb / aaa / aaa-csit-tls.yaml

diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml
index 11423ffd268af1ec761d465658637a61833d51aa..7898be6599cdc85ac21db78a0ca0e24287b4aec3 100644 (file)
--- a/jjb/aaa/aaa-csit-tls.yaml
+++ b/jjb/aaa/aaa-csit-tls.yaml
@@ -2,7 +2,7 @@
 - project:
     name: aaa-csit-tls
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - inttest-csit-1node
 
     # The project name
     project: 'aaa'
@@ -12,21 +12,23 @@
 
     # Project branches
     stream:
-      - carbon:
+      - oxygen:
           branch: 'master'
-          jre: 'openjdk8'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     install:
       - only:
           scope: 'only'
 
     # Features to install
-    install-features: odl-restconf,
-        odl-netconf-all,
-        http
+    install-features: odl-ovsdb-southbound-impl-rest
 
     # Robot custom options
     robot-options: ''
 
-    # Don't spin up mininet vms as aaa-csit-authn jobs don't need them
-    tools_system_count: 0
+    # mininet image
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847