Merge "Add a swap file to build machines"

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

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 9f69b38653986daa04e0c6d4bc191e349c782b89..d090eebea62b27a5ef91ce80a2e98b48c44362d1 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -3,20 +3,16 @@
     name: dlux-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
     project: 'dlux'
     project-name: 'dlux'
     branch: 'master'
-    jdks:
-      - openjdk8
     mvn-settings: 'dlux-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
@@ -25,20 +21,16 @@
     name: dlux-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
     project: 'dlux'
     project-name: 'dlux'
     branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
     mvn-settings: 'dlux-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
@@ -47,7 +39,6 @@
     name: dlux-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,13 +46,10 @@
     project-name: 'dlux'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdks:
-      - openjdk8
     mvn-settings: 'dlux-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f