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 a19aaa85cdfc4dea13dec8fc42a6b971b71e7923..f1719f93bc8fb315412339133c211a5657773a9e 100644 (file)
--- a/jjb/vtn/vtn-patch-test.yaml
+++ b/jjb/vtn/vtn-patch-test.yaml
@@ -2,7 +2,7 @@
 - project:
     name: vtn-patch-test
     jobs:
-      - '{project}-patch-test-{feature}-{stream}'
+      - inttest-patch-test
 
     # The project name
     project: 'vtn'
@@ -11,16 +11,19 @@
 
     # Project branches
     stream:
-      - carbon:
+      - oxygen:
           branch: 'master'
-          jdk: 'openjdk8'
           csit-list: >
-             vtn-csit-1node-manager-only-{stream},
-             vtn-csit-3node-manager-only-{stream}
-
-      - boron:
-          branch: 'stable/boron'
-          jdk: 'openjdk8'
+             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-only-{stream},
-             vtn-csit-3node-manager-only-{stream}
+             vtn-csit-1node-manager-all-{stream},
+             vtn-csit-3node-manager-all-{stream}