Merge "Remove infrautils carbon 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 89d7fc764467162fc538f2c088d8e738021feb2e..c085faa4fd207e8c4fbbc8bb82fce7c7e4a4054a 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}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'aaa'
@@ -12,21 +13,16 @@
 
     # Project branches
     stream:
-        - boron:
-            branch: 'master'
-            jdk: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: 'openjdk7'
-        - stable-lithium:
-            branch: 'stable/lithium'
-            jdk: 'openjdk7'
+      - fluorine:
+          branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
+      - nitrogen:
+          branch: 'stable/nitrogen'
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
 
     # Features to install
     install-features: 'odl-restconf'
@@ -34,5 +30,5 @@
     # 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