Switch the csit-verify-1node to use job prefix

[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 12ec27ff25df343c4703e2f368f659a745b3fb69..b76745f61af7e4be22fd262e88782f07b71905a2 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}'
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'aaa'
@@ -12,25 +13,17 @@
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jre: 'openjdk8'
-        - boron:
-            branch: 'stable/boron'
-            jre: 'openjdk8'
-        - beryllium:
-            branch: 'stable/beryllium'
-            jre: 'openjdk7'
-        - stable-lithium:
-            disabled: true
-            branch: 'stable/lithium'
-            jre: 'openjdk7'
+      - oxygen:
+          branch: 'master'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     install:
-        - only:
-            scope: 'only'
-        - all:
-            scope: 'all'
+      - all:
+          scope: 'all'
 
     # Features to install
     install-features: 'odl-restconf'
@@ -38,8 +31,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
-    mininet-vms: 0
+    tools_system_count: 0