Merge "Update validate-ar jobs for silicon"

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

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index 481a146646e72cd76298b2effac9646713ee6bf1..a943672e92d40a5a15b6f394149596174585f043 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: daexim-silicon
+    name: daexim-phosphorus
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
@@ -13,7 +13,7 @@
 
     project: "daexim"
     project-name: "daexim"
-    stream: silicon
+    stream: phosphorus
     branch: "master"
     java-version: "openjdk11"
     mvn-settings: "daexim-settings"
@@ -25,7 +25,7 @@
     staging-profile-id: 96e4dade34bd7
 
 - project:
-    name: daexim-aluminium
+    name: daexim-silicon
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
@@ -38,8 +38,8 @@
 
     project: "daexim"
     project-name: "daexim"
-    stream: aluminium
-    branch: "stable/aluminium"
+    stream: silicon
+    branch: "stable/silicon"
     java-version: "openjdk11"
     mvn-settings: "daexim-settings"
     mvn-opts: "-Xmx1024m"
@@ -50,7 +50,7 @@
     staging-profile-id: 96e4dade34bd7
 
 - project:
-    name: daexim-magnesium
+    name: daexim-aluminium
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
@@ -63,8 +63,8 @@
 
     project: "daexim"
     project-name: "daexim"
-    stream: magnesium
-    branch: "stable/magnesium"
+    stream: aluminium
+    branch: "stable/aluminium"
     java-version: "openjdk11"
     mvn-settings: "daexim-settings"
     mvn-opts: "-Xmx1024m"
@@ -75,7 +75,7 @@
     staging-profile-id: 96e4dade34bd7
 
 - project:
-    name: daexim-sodium
+    name: daexim-magnesium
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
@@ -83,13 +83,14 @@
           project-pattern: daexim
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-daexim/47611/
           rtd-token: 76284f12638574f131cdccdf257d852d07c195fc
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     project: "daexim"
     project-name: "daexim"
-    stream: sodium
-    branch: "stable/sodium"
+    stream: magnesium
+    branch: "stable/magnesium"
+    java-version: "openjdk11"
     mvn-settings: "daexim-settings"
     mvn-opts: "-Xmx1024m"
     dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"