Merge "Use latest Ubuntu 18.04 image for tools system"

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

diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml
index d19151bd8b3f8b003826c90f552c46cc360e3ee2..70c29cbb222bb001e40690f1e757168badbd2824 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -2,41 +2,36 @@
 - project:
     name: aaa-csit-authn
     jobs:
-      - '{project}-csit-1node-{functionality}-{install}-{stream}'
-      - '{project}-csit-verify-1node-{functionality}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
-    project: 'aaa'
+    project: "aaa"
 
     # The functionality under test
-    functionality: 'authn'
+    functionality: "authn"
 
     # Project branches
     stream:
-      - oxygen:
-          branch: 'master'
-          jre: 'openjdk8'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-          jre: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jre: 'openjdk8'
-          karaf-version: karaf3
-      - boron:
-          branch: 'stable/boron'
-          jre: 'openjdk8'
-          karaf-version: karaf3
+      - chlorine:
+          branch: "master"
+          jre: "openjdk17"
+      - sulfur:
+          branch: "stable/sulfur"
+          jre: "openjdk11"
+      - phosphorus:
+          branch: "stable/phosphorus"
+          jre: "openjdk11"
 
     install:
       - all:
-          scope: 'all'
+          scope: "all"
 
     # Features to install
-    install-features: 'odl-restconf'
+    install-features: "odl-restconf"
 
     # Robot custom options
-    robot-options: ''
+    robot-options: ""
 
     # Don't spin up mininet vms as aaa-csit-authn jobs don't need them
     tools_system_count: 0