Merge "Sodium branch cutting"

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

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index ff1ec5ce0c2b683d97937401ba572464eddacbdd..d796dc8c265b006168a7aa92c9fb4eaba7090924 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: genius-sodium
+    name: genius-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -14,7 +14,7 @@
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: sodium
+    stream: magnesium
     project: 'genius'
     project-name: 'genius'
     branch: 'master'
@@ -34,7 +34,7 @@
     staging-profile-id: 96fb4b6d9d1ee
 
 - project:
-    name: genius-neon
+    name: genius-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -48,10 +48,10 @@
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: neon
+    stream: sodium
     project: 'genius'
     project-name: 'genius'
-    branch: 'stable/neon'
+    branch: 'stable/sodium'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -68,7 +68,7 @@
     staging-profile-id: 96fb4b6d9d1ee
 
 - project:
-    name: genius-fluorine
+    name: genius-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -79,10 +79,13 @@
           rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
       - odl-maven-jobs
 
-    stream: fluorine
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: neon
     project: 'genius'
     project-name: 'genius'
-    branch: 'stable/fluorine'
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -99,7 +102,7 @@
     staging-profile-id: 96fb4b6d9d1ee
 
 - project:
-    name: genius-oxygen
+    name: genius-fluorine
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -110,10 +113,10 @@
           rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
       - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'genius'
     project-name: 'genius'
-    branch: 'stable/oxygen'
+    branch: 'stable/fluorine'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -125,7 +128,6 @@
         openflowplugin-merge-{stream},
         neutron-merge-{stream}
     email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
-    disable-job: 'true'
 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee