Remove all Neon jobs

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

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index 662dd6aafb9a2bb726c76dece7ecefe310393ffb..d597f70f66ed74fa85b7438c5f2f673b76deb14f 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: unimgr-magnesium
+    name: unimgr-aluminium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -11,7 +11,7 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: magnesium
+    stream: aluminium
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'master'
@@ -25,31 +25,7 @@
     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-neon
+    name: unimgr-magnesium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -59,10 +35,10 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: neon
+    stream: magnesium
     project: 'unimgr'
     project-name: 'unimgr'
-    branch: 'stable/neon'
+    branch: 'stable/magnesium'
     mvn-settings: 'unimgr-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'ovsdb-merge-{stream}'
@@ -73,7 +49,7 @@
     staging-profile-id: a695d0a0b8d51
 
 - project:
-    name: unimgr-fluorine
+    name: unimgr-sodium
     jobs:
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
@@ -83,16 +59,15 @@
       - odl-maven-jobs
       - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: sodium
     project: 'unimgr'
     project-name: 'unimgr'
-    branch: 'stable/fluorine'
+    branch: 'stable/sodium'
     mvn-settings: 'unimgr-settings'
     mvn-opts: '-Xmx1024m'
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
     build-node: centos7-builder-4c-16g
-    disable-job: true
 
     # Used by the release job
     staging-profile-id: a695d0a0b8d51