X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fdlux%2Fdlux.yaml;h=d22698d0f73bbf038bcb93bf991236f18d81cac8;hb=0bb569924b54877b36a3ca61e46d1362ca05e594;hp=c05f468072f5e00ba1ce77cfaa66a388403022cc;hpb=7b5e27ed8784b8ea44715042dc06ba590eceb19c;p=releng%2Fbuilder.git

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index c05f46807..d22698d0f 100644
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -1,53 +1,46 @@
 ---
 - project:
-    name: dlux-magnesium
+    name: dlux-master
     jobs:
-      - gerrit-release-merge
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: magnesium
-    project: 'dlux'
-    project-name: 'dlux'
-    branch: 'master'
-    java-version: 'openjdk11'
-    mvn-settings: 'dlux-settings'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[dlux] [odlparent]'
+    stream: master
+    project: "dlux"
+    project-name: "dlux"
+    branch: "master"
+    java-version: "openjdk11"
+    mvn-settings: "dlux-settings"
+    dependencies: "odlparent-merge-{stream}"
+    email-upstream: "[dlux] [odlparent]"
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
 
 - project:
-    name: dlux-sodium
+    name: dlux-release-management
     jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+      - gerrit-release-merge
 
-    stream: sodium
-    project: 'dlux'
-    project-name: 'dlux'
-    branch: 'stable/sodium'
-    mvn-settings: 'dlux-settings'
-    dependencies: 'odlparent-merge-{stream}'
-    email-upstream: '[dlux] [odlparent]'
+    project: dlux
+    project-name: dlux
 
-    # Used by the release job
-    staging-profile-id: 96e6a0327484f
+    build-node: centos7-builder-2c-1g
+    mvn-settings: dlux-settings
 
 - project:
     name: dlux-sonar
     jobs:
       - gerrit-maven-sonar
-    project: 'dlux'
-    project-name: 'dlux'
-    branch: 'master'
-    mvn-settings: 'dlux-settings'
-    mvn-opts: '-Xmx1024m'
+    project: "dlux"
+    project-name: "dlux"
+    branch: "master"
+    mvn-settings: "dlux-settings"
+    mvn-opts: "-Xmx1024m"
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: dlux-info