Merge "Minimize CSIT dependencis in mininet-ovs-2.8 image"

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

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 25289309cae3273b4fedca599ed25e7630111f03..9413a3ffd2945eb8e1eb5e2b0dfdb034d2ea1722 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -6,30 +6,13 @@
       - 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]'
-
-    # Used by the release job
-    staging-profile-id: 96e6a0327484f
-
-- project:
-    name: dlux-sodium
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    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"
+    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
@@ -49,15 +32,15 @@
     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