Merge "Update cloud image Ubuntu18.04 helm x86_64"

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

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index e1fba2c64cf675f9926e4f2271e8ec8a825881d6..dff786c0bd10c6e6657e0a336cf4f0c35df43373 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -1,13 +1,13 @@
 ---
 - project:
-    name: dluxapps-silicon
+    name: dluxapps-master
     jobs:
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     project: "dluxapps"
     project-name: "dluxapps"
-    stream: silicon
+    stream: master
     branch: "master"
     build-node: centos7-builder-2c-8g
     mvn-settings: "dluxapps-settings"
@@ -19,46 +19,6 @@
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9
 
-- project:
-    name: dluxapps-aluminium
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    project: "dluxapps"
-    project-name: "dluxapps"
-    stream: aluminium
-    branch: "stable/aluminium"
-    build-node: centos7-builder-2c-8g
-    mvn-settings: "dluxapps-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
-    email-upstream: "[dluxapps] [odlparent] [yangtools] [controller]"
-    disable-job: true
-
-    # Used by the release job
-    staging-profile-id: 96e6fb1e65bf9
-
-- project:
-    name: dluxapps-magnesium
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    project: "dluxapps"
-    project-name: "dluxapps"
-    stream: magnesium
-    branch: "stable/magnesium"
-    build-node: centos7-builder-2c-8g
-    mvn-settings: "dluxapps-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
-    email-upstream: "[dluxapps] [odlparent] [yangtools] [controller]"
-    disable-job: true
-
-    # Used by the release job
-    staging-profile-id: 96e6fb1e65bf9
-
 - project:
     name: dluxapps-release-management
     jobs: