removing vtn-all jobs from distribution-test list

[releng/builder.git] / jjb / integration / integration-distribution-jobs.yaml

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index 29f70c716f4558db408502e042f2480714c05d2c..c0914b445a39baa8939ae904094a4090b6c0825a 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -9,18 +9,18 @@
         - 'integration-patch-distribution-{stream}'
 
     stream:
-        - pre-boron:
-            branch: 'pre-boron'
-        - beryllium:
+        - boron:
             branch: 'master'
-
+            jdk: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
-
+            jdk: 'openjdk7'
         - stable-helium:
             branch: 'stable/helium'
-
-    jdk: 'openjdk7'
+            jdk: 'openjdk7'
 
 
 - job-template:
@@ -150,7 +150,7 @@
     name: 'integration-distribution-deploy-{stream}'
 
     project-type: freestyle
-    node: dynamic_controller
+    node: dynamic_verify
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -165,6 +165,8 @@
             branch: '{branch}'
         - integration-bundleurl:
             bundleurl: 'last'
+        - integration-jdk-version:
+            jdkversion: 'openjdk7'
 
     wrappers:
         - build-timeout
@@ -197,7 +199,7 @@
     name: 'integration-distribution-offline-{stream}'
 
     project-type: freestyle
-    node: dynamic_controller
+    node: dynamic_verify
 
     logrotate:
         daysToKeep: '{build-days-to-keep}'
@@ -212,6 +214,8 @@
             branch: '{branch}'
         - integration-bundleurl:
             bundleurl: 'last'
+        - integration-jdk-version:
+            jdkversion: 'openjdk7'
 
     wrappers:
         - build-timeout
@@ -329,4 +333,3 @@
     publishers:
         - email-notification:
             email-prefix: '[$GERRIT_PROJECT]'
-