Merge "Clean up log file size increase logic"

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

diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml
index 375e2c5654118f5824aef4e4149733ab8b77946f..f3932e81b45642b8e049cac21dcccd68c8c50891 100644 (file)
--- a/jjb/netvirt/netvirt.yaml
+++ b/jjb/netvirt/netvirt.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: netvirt-magnesium
+    name: netvirt-aluminium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -17,7 +17,7 @@
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: magnesium
+    stream: aluminium
     branch: 'master'
 
     project: 'netvirt'
@@ -40,7 +40,7 @@
     staging-profile-id: a67da0ffbb1ba
 
 - project:
-    name: netvirt-sodium
+    name: netvirt-magnesium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -51,17 +51,19 @@
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netvirt/32929/
           rtd-token: 7b6a1dcfc729957ace511e016274e253e07a8d6c
       - gerrit-tox-verify
-      - odl-maven-jobs
+      - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: sodium
-    branch: 'stable/sodium'
+    stream: magnesium
+    branch: 'stable/magnesium'
 
     project: 'netvirt'
     project-name: 'netvirt'
+
+    java-version: 'openjdk11'
     mvn-settings: 'netvirt-settings'
     mvn-opts: '-Xmx2048m'
     build-timeout: 90
@@ -78,7 +80,7 @@
     staging-profile-id: a67da0ffbb1ba
 
 - project:
-    name: netvirt-neon
+    name: netvirt-sodium
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
@@ -95,8 +97,8 @@
     csit-gate-list: 'netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}'
     block_on_csit: false
 
-    stream: neon
-    branch: 'stable/neon'
+    stream: sodium
+    branch: 'stable/sodium'
 
     project: 'netvirt'
     project-name: 'netvirt'