Merge "Use openjdk11 for Magnesium Multi-patch"

[releng/builder.git] / jjb / autorelease / autorelease-projects.yaml

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 1aaceb430f72338abf5eeb19056cf43abb96065a..f891270b9359b82978179ac9199772f066e761c2 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -14,9 +14,6 @@
       - gerrit-tox-verify
 
     stream:
-      - magnesium:
-          branch: 'master'
-          integration-test: magnesium
       - sodium:
           branch: 'stable/sodium'
           integration-test: sodium
@@ -57,10 +54,12 @@
           build-node: centos7-autorelease-4c-16g
 
     stream:
-      - sodium:
+      - magnesium:
           branch: 'master'
-          integration-test: sodium
-          java-version: openjdk11
+          integration-test: magnesium
+      - sodium:
+          branch: 'stable/sodium'
+          integration-test: sodium-dev-null
 
     project: releng/autorelease
     project-name: autorelease
@@ -82,7 +81,7 @@
         -Dcheckstyle.skip=true
         -Dskip.karaf.featureTest=true
         -Dsft.heap.max=4g
-    java-version: openjdk8
+    java-version: openjdk11
 
 - project:
     name: autorelease-view