Merge "Update CentOS 7 devstack Ocata image"

[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 6ce6addca3b3961bf1a66a9b91d2524c1b215fc5..6e378e4a5eab445b43f146cf1dc2f310e515aa06 100644 (file)
--- a/jjb/vtn/vtn-patch-test.yaml
+++ b/jjb/vtn/vtn-patch-test.yaml
@@ -11,21 +11,19 @@
 
     # Project branches
     stream:
-      - nitrogen:
+      - 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'
+          csit-list: >
+             vtn-csit-1node-manager-all-{stream},
+             vtn-csit-3node-manager-all-{stream}
       - carbon:
           branch: 'stable/carbon'
-          jdk: 'openjdk8'
-          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}