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 880b93cf7b3444a826fd23a89447ae7bd01b83fd..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'
@@ -13,27 +13,17 @@
     stream:
       - oxygen:
           branch: 'master'
-          jdk: 'openjdk8'
           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}
       - nitrogen:
           branch: 'stable/nitrogen'
-          jdk: 'openjdk8'
           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}
       - carbon:
           branch: 'stable/carbon'
-          jdk: 'openjdk8'
           karaf-version: karaf3
           csit-list: >
-             vtn-csit-1node-manager-only-{stream},
-             vtn-csit-3node-manager-only-{stream}
-      - boron:
-          branch: 'stable/boron'
-          jdk: 'openjdk8'
-          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}