Merge "Feat!: Decommission log shipping on Nexus"

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

diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml
index a943672e92d40a5a15b6f394149596174585f043..377dab05cfa22cc5a03d1944f4c619ede499a64b 100644 (file)
--- a/jjb/daexim/daexim.yaml
+++ b/jjb/daexim/daexim.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: daexim-phosphorus
+    name: daexim-sulfur
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
@@ -13,7 +13,7 @@
 
     project: "daexim"
     project-name: "daexim"
-    stream: phosphorus
+    stream: sulfur
     branch: "master"
     java-version: "openjdk11"
     mvn-settings: "daexim-settings"
@@ -25,32 +25,7 @@
     staging-profile-id: 96e4dade34bd7
 
 - project:
-    name: daexim-silicon
-    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-jdk11
-      - odl-maven-verify-jobs
-
-    project: "daexim"
-    project-name: "daexim"
-    stream: silicon
-    branch: "stable/silicon"
-    java-version: "openjdk11"
-    mvn-settings: "daexim-settings"
-    mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}"
-    email-upstream: "[daexim] [odlparent] [yangtools] [controller]"
-
-    # Used by the release job
-    staging-profile-id: 96e4dade34bd7
-
-- project:
-    name: daexim-aluminium
+    name: daexim-phosphorus
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
@@ -63,8 +38,8 @@
 
     project: "daexim"
     project-name: "daexim"
-    stream: aluminium
-    branch: "stable/aluminium"
+    stream: phosphorus
+    branch: "stable/phosphorus"
     java-version: "openjdk11"
     mvn-settings: "daexim-settings"
     mvn-opts: "-Xmx1024m"
@@ -75,7 +50,7 @@
     staging-profile-id: 96e4dade34bd7
 
 - project:
-    name: daexim-magnesium
+    name: daexim-silicon
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-rtd-jobs":
@@ -88,8 +63,8 @@
 
     project: "daexim"
     project-name: "daexim"
-    stream: magnesium
-    branch: "stable/magnesium"
+    stream: silicon
+    branch: "stable/silicon"
     java-version: "openjdk11"
     mvn-settings: "daexim-settings"
     mvn-opts: "-Xmx1024m"