Merge "Remove ansible from builder"

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

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index c05f468072f5e00ba1ce77cfaa66a388403022cc..9413a3ffd2945eb8e1eb5e2b0dfdb034d2ea1722 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -2,52 +2,45 @@
 - project:
     name: dlux-magnesium
     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]'
+    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