Merge "Build AR Magnesium with openjdk11"

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

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 7fed129bf99b06d018563d17035b0d1d9b7221d9..b9fedfb97232689ea0c6dc28e6d5f5800edcce10 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: daexim-sodium
+    name: daexim-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -9,10 +9,11 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
           rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
     project: 'daexim'
     project-name: 'daexim'
-    stream: sodium
+    stream: magnesium
     branch: 'master'
     mvn-settings: 'daexim-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -23,7 +24,7 @@
     staging-profile-id: 96e4dade34bd7
 
 - project:
-    name: daexim-neon
+    name: daexim-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -32,11 +33,12 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
           rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
     project: 'daexim'
     project-name: 'daexim'
-    stream: neon
-    branch: 'stable/neon'
+    stream: sodium
+    branch: 'stable/sodium'
     mvn-settings: 'daexim-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -46,7 +48,7 @@
     staging-profile-id: 96e4dade34bd7
 
 - project:
-    name: daexim-fluorine
+    name: daexim-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -55,11 +57,12 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
           rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
     project: 'daexim'
     project-name: 'daexim'
-    stream: fluorine
-    branch: 'stable/fluorine'
+    stream: neon
+    branch: 'stable/neon'
     mvn-settings: 'daexim-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
@@ -69,20 +72,25 @@
     staging-profile-id: 96e4dade34bd7
 
 - project:
-    name: daexim-oxygen
+    name: daexim-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: daexim
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
+          rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
     project: 'daexim'
     project-name: 'daexim'
-    stream: oxygen
-    branch: 'stable/oxygen'
+    stream: fluorine
+    branch: 'stable/fluorine'
     mvn-settings: 'daexim-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
-    disable-job: 'true'
 
     # Used by the release job
     staging-profile-id: 96e4dade34bd7