Merge "Add a swap file to build machines"

[releng/builder.git] / jjb / odlparent / odlparent.yaml

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index a7e9267d03e3f650337a3b0311d24fef89294234..24da0238326a059a50b5c16bbb1d5da260b7563a 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -12,8 +12,6 @@
     branch: master
     distribution_branch: master
 
-    jdks:
-      - openjdk8
     mvn-settings: odlparent-settings
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     mvn-version: mvn35
@@ -44,8 +42,6 @@
     branch: 3.1.x
     distribution_branch: master
 
-    jdks:
-      - openjdk8
     mvn-settings: odlparent-settings
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
@@ -76,8 +72,6 @@
     branch: 3.0.x
     distribution_branch: master
 
-    jdks:
-      - openjdk8
     mvn-settings: odlparent-settings
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
@@ -108,8 +102,6 @@
     branch: 2.0.x
     distribution_branch: master
 
-    jdks:
-      - openjdk8
     mvn-settings: odlparent-settings
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
@@ -131,7 +123,6 @@
     name: odlparent-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
       - gerrit-tox-verify
@@ -141,8 +132,6 @@
     project-name: 'odlparent'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'odlparent-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''