Remove unsupported Beryllium jobs

[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 26368684ba266a5540cc055510346b14d2081f21..61074842ab8211cd8bbef39987116d8de0406de1 100644 (file)
--- a/jjb/aaa/aaa-csit-authn.yaml
+++ b/jjb/aaa/aaa-csit-authn.yaml
@@ -1,8 +1,9 @@
+---
 - project:
     name: aaa-csit-authn
     jobs:
-        - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}'
+      - '{project}-csit-1node-{functionality}-{install}-{stream}'
+      - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'aaa'
@@ -12,22 +13,29 @@
 
     # Project branches
     stream:
-        - beryllium:
-            branch: 'master'
-        - stable-lithium:
-            branch: 'stable/lithium'
+      - nitrogen:
+          branch: 'master'
+          jre: 'openjdk8'
+      - carbon:
+          branch: 'stable/carbon'
+          jre: 'openjdk8'
+          karaf-version: karaf3
+      - boron:
+          branch: 'stable/boron'
+          jre: 'openjdk8'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - only:
+          scope: 'only'
+      - all:
+          scope: 'all'
 
     # Features to install
-    install-features: 'odl-openflowplugin-flow-services-ui,odl-aaa-api,odl-aaa-authn,odl-aaa-authz,odl-aaa-sssd-plugin,odl-aaa-netconf-plugin'
+    install-features: 'odl-restconf'
 
     # Robot custom options
     robot-options: ''
 
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},aaa-distribution-{stream}'
+    # Don't spin up mininet vms as aaa-csit-authn jobs don't need them
+    tools_system_count: 0