Merge "Add YANG module check in distribution merge job"

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

diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml
index 4036ef22cef63f6121736caa746a13d2946decf2..ae5e22a810559079b35fa1acf2fb00bfc54d112a 100644 (file)
--- a/jjb/genius/genius.yaml
+++ b/jjb/genius/genius.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: genius-neon
+    name: genius-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -9,15 +9,21 @@
           project-pattern: genius
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
           rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
+      - odl-maven-verify-jobs:
+          java-version:
+            - openjdk11
 
-    stream: neon
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: magnesium
     project: 'genius'
     project-name: 'genius'
     branch: 'master'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     build-timeout: 90
     dependencies: >
         controller-merge-{stream},
@@ -31,7 +37,7 @@
     staging-profile-id: 96fb4b6d9d1ee
 
 - project:
-    name: genius-fluorine
+    name: genius-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -41,14 +47,18 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
           rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: fluorine
+    csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
+    block_on_csit: false
+
+    stream: sodium
     project: 'genius'
     project-name: 'genius'
-    branch: 'stable/fluorine'
+    branch: 'stable/sodium'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     build-timeout: 90
     dependencies: >
         controller-merge-{stream},
@@ -62,7 +72,7 @@
     staging-profile-id: 96fb4b6d9d1ee
 
 - project:
-    name: genius-oxygen
+    name: genius-neon
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -72,14 +82,18 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/
           rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f
       - odl-maven-jobs
+      - odl-maven-verify-jobs
 
-    stream: oxygen
+    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/oxygen'
+    branch: 'stable/neon'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
     build-timeout: 90
     dependencies: >
         controller-merge-{stream},
@@ -101,7 +115,7 @@
     branch: 'master'
     build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-opts: '-Xmx1024m'
 
 - project:
     name: genius-view