Merge "Skip SFT during mdsal-sonar"

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

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index f5896cdeab40465146ba3a032366f03c1446c6e7..fd9b0d9ee257bd50a0236edd3a8c080d97026ee0 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -12,6 +12,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
@@ -29,6 +30,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
@@ -46,25 +48,7 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
-
-    # Used by the release job
-    staging-profile-id: 96e6a0327484f
-
-- project:
-    name: dlux-oxygen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - odl-maven-jobs
-
-    stream: oxygen
-    project: 'dlux'
-    project-name: 'dlux'
-    branch: 'stable/oxygen'
-    mvn-settings: 'dlux-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[dlux] [odlparent]'
-    disable-job: 'true'
+    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
@@ -78,6 +62,7 @@
     branch: 'master'
     mvn-settings: 'dlux-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    disable-job: true
 
 - project:
     name: dlux-view