Update l2switch jobs

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

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index 758837e1224edfce789d0f1bcc5e936370bce439..d7e136fcb1e292e93644904eda12212d231555e0 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -1,42 +1,19 @@
 ---
 - project:
-    name: l2switch-phosphorus
+    name: l2switch-master
     jobs:
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: phosphorus
-    project: "l2switch"
-    project-name: "l2switch"
-    branch: "master"
-    mvn-settings: "l2switch-settings"
-    mvn-opts: "-Xmx1024m -Dmaven.compile.fork=true"
-    dependencies: >
-      odlparent-merge-{stream},
-      yangtools-merge-{stream},
-      controller-merge-{stream},
-      openflowjava-merge-{stream},
-      openflowplugin-merge-{stream}
-    email-upstream:
-      "[l2switch] [odlparent] [yangtools] [controller] [openflowjava]\
-      \ [openflowplugin]"
-    disable-job: true
-
-    # Used by the release job
-    staging-profile-id: 96fee85953ca0
-
-- project:
-    name: l2switch-silicon
-    jobs:
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
+    project: l2switch
+    project-name: l2switch
+    branch: master
+    stream: master
 
-    stream: silicon
-    project: "l2switch"
-    project-name: "l2switch"
-    branch: "stable/silicon"
+    java-version: "openjdk11"
     mvn-settings: "l2switch-settings"
-    mvn-opts: "-Xmx1024m -Dmaven.compile.fork=true"
+    mvn-version: mvn36
+
     dependencies: >
       odlparent-merge-{stream},
       yangtools-merge-{stream},
@@ -46,7 +23,6 @@
     email-upstream:
       "[l2switch] [odlparent] [yangtools] [controller] [openflowjava]\
       \ [openflowplugin]"
-    disable-job: true
 
     # Used by the release job
     staging-profile-id: 96fee85953ca0
@@ -70,8 +46,7 @@
     project-name: "l2switch"
     branch: "master"
     mvn-settings: "l2switch-settings"
-    mvn-opts: "-Xmx1024m -Dmaven.compile.fork=true"
-    disable-job: true
+    mvn-opts: "-Xmx1024m"
     sonarcloud: true
     sonarcloud-project-organization: "{sonarcloud_project_organization}"
     sonarcloud-api-token: "{sonarcloud_api_token}"