Merge "Disable apex management jobs"

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

diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml
index 7fb3c583c6edfef9cf9a20971881f79668eceb6f..b465938c8864c9dcef098fdb25bc293c34b77be7 100644 (file)
--- a/jjb/netconf/netconf.yaml
+++ b/jjb/netconf/netconf.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: netconf-sodium
+    name: netconf-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -9,8 +9,9 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/
           rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: sodium
+    stream: magnesium
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'
@@ -26,7 +27,7 @@
     staging-profile-id: a67b22fc3663f
 
 - project:
-    name: netconf-neon
+    name: netconf-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -35,11 +36,12 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/
           rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: neon
+    stream: sodium
     project: 'netconf'
     project-name: 'netconf'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean deploy -Pintegrationtests'
@@ -52,7 +54,7 @@
     staging-profile-id: a67b22fc3663f
 
 - project:
-    name: netconf-fluorine
+    name: netconf-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-rtd-jobs':
@@ -61,11 +63,12 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/
           rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
+    stream: neon
     project: 'netconf'
     project-name: 'netconf'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean deploy -Pintegrationtests'
@@ -78,15 +81,21 @@
     staging-profile-id: a67b22fc3663f
 
 - project:
-    name: netconf-oxygen
+    name: netconf-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-rtd-jobs':
+          build-node: centos7-builder-2c-2g
+          project-pattern: netconf
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netconf/48397/
+          rtd-token: aee2df909686ab7ba36f2ed08d90bdcf81f7b8dc
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'netconf'
     project-name: 'netconf'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean deploy -Pintegrationtests'
@@ -94,7 +103,6 @@
     build-timeout: 90
     dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
-    disable-job: true
 
     # Used by the release job
     staging-profile-id: a67b22fc3663f