Merge "Update Ansible playbooks to new names"

[releng/builder.git] / jjb / vtn / vtn-patch-test.yaml

diff --git a/jjb/vtn/vtn-patch-test.yaml b/jjb/vtn/vtn-patch-test.yaml
index 556f65c7883ee038d308ad3bfd831641ad63d29e..f1719f93bc8fb315412339133c211a5657773a9e 100644 (file)
--- a/jjb/vtn/vtn-patch-test.yaml
+++ b/jjb/vtn/vtn-patch-test.yaml
@@ -1,7 +1,8 @@
+---
 - project:
     name: vtn-patch-test
     jobs:
-        - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'vtn'
@@ -10,16 +11,19 @@
 
     # Project branches
     stream:
-        - carbon:
-            branch: 'master'
-            jdk: 'openjdk8'
-            csit-list: >
-               vtn-csit-1node-manager-only-{stream},
-               vtn-csit-3node-manager-only-{stream}
-
-        - boron:
-            branch: 'stable/boron'
-            jdk: 'openjdk8'
-            csit-list: >
-               vtn-csit-1node-manager-only-{stream},
-               vtn-csit-3node-manager-only-{stream}
+      - oxygen:
+          branch: 'master'
+          csit-list: >
+             vtn-csit-1node-manager-all-{stream},
+             vtn-csit-3node-manager-all-{stream}
+      - nitrogen:
+          branch: 'stable/nitrogen'
+          csit-list: >
+             vtn-csit-1node-manager-all-{stream},
+             vtn-csit-3node-manager-all-{stream}
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
+          csit-list: >
+             vtn-csit-1node-manager-all-{stream},
+             vtn-csit-3node-manager-all-{stream}