Merge "Update Ansible playbooks to new names"

[releng/builder.git] / jjb / capwap / capwap-csit-ac.yaml

diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml
index 84e978f93a951cf8dba1ccf952b987e7de51d888..6a5975d5da77bda50aefd0dda80c66baa4b8668a 100644 (file)
--- a/jjb/capwap/capwap-csit-ac.yaml
+++ b/jjb/capwap/capwap-csit-ac.yaml
@@ -1,8 +1,9 @@
+---
 - project:
     name: capwap-csit-ac
     jobs:
-        - '{project}-csit-1node-cds-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-{functionality}-{stream}'
+      - inttest-csit-1node
+      - inttest-csit-verify-1node
 
     # The project name
     project: 'capwap'
@@ -12,22 +13,20 @@
 
     # Project branches
     stream:
-        - master:
-            branch: 'master'
-        - stable-lithium:
-            branch: 'stable/lithium'
+      - 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-capwap-ac-rest'
 
     # Robot custom options
     robot-options: ''
-
-    # Trigger jobs (upstream dependencies)
-    trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},odlparent-distribution-{stream},capwap-distribution-{stream}'