Fix JDK11 in unimgr jobs

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

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 11afb82b815506323ad7703d0ab1f73f3fe3f5e6..46b7c02c6c858a3eddeee2228f827c3b94d233d9 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -1,16 +1,16 @@
 ---
 - project:
-    name: unimgr-silicon
+    name: unimgr-master
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
           project-pattern: unimgr
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-unimgr/49748/
           rtd-token: e12225e9b9ac67f5439c1619dcad342393b7ea31
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    stream: silicon
+    stream: master
     project: "unimgr"
     project-name: "unimgr"
     branch: "master"
@@ -29,7 +29,7 @@
     staging-profile-id: a695d0a0b8d51
 
 - project:
-    name: unimgr-aluminium
+    name: unimgr-fluorine
     jobs:
       - "{project-name}-rtd-jobs":
           build-node: centos7-builder-2c-2g
@@ -39,11 +39,11 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: aluminium
+    stream: fluorine
     project: "unimgr"
     project-name: "unimgr"
-    branch: "stable/aluminium"
-    java-version: "openjdk11"
+    branch: "stable/fluorine"
+    java-version: "openjdk8"
     mvn-settings: "unimgr-settings"
     mvn-opts: "-Xmx1024m"
     dependencies: >
@@ -57,55 +57,6 @@
     # Used by the release job
     staging-profile-id: a695d0a0b8d51
 
-- project:
-    name: unimgr-magnesium
-    jobs:
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: unimgr
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-unimgr/49748/
-          rtd-token: e12225e9b9ac67f5439c1619dcad342393b7ea31
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: magnesium
-    project: "unimgr"
-    project-name: "unimgr"
-    branch: "stable/magnesium"
-    java-version: "openjdk11"
-    mvn-settings: "unimgr-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "ovsdb-merge-{stream}"
-    email-upstream: "[unimgr] [ovsdb]"
-    build-node: centos7-builder-4c-16g
-
-    # Used by the release job
-    staging-profile-id: a695d0a0b8d51
-
-- project:
-    name: unimgr-sodium
-    jobs:
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: unimgr
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-unimgr/49748/
-          rtd-token: e12225e9b9ac67f5439c1619dcad342393b7ea31
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    stream: sodium
-    project: "unimgr"
-    project-name: "unimgr"
-    branch: "stable/sodium"
-    mvn-settings: "unimgr-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "ovsdb-merge-{stream}"
-    email-upstream: "[unimgr] [ovsdb]"
-    build-node: centos7-builder-4c-16g
-
-    # Used by the release job
-    staging-profile-id: a695d0a0b8d51
-
 - project:
     name: unimgr-release-management
     jobs: