Merge "Remove all Neon jobs"

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

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 164d6eba9137d422db08f0d0f6e035b001adc165..f15d67080271c65d2c404a1690a10d7f05a230e7 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -8,25 +8,15 @@
           build-node: centos7-autorelease-4c-16g
       - 'autorelease-update-submodules-{stream}'
       - 'autorelease-update-validate-jobs-{stream}'
-      - 'autorelease-version-bump-{stream}':
+      - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}':
           build-node: centos7-autorelease-4c-16g
       - '{project-name}-validate-autorelease-{stream}'
       - gerrit-tox-verify
 
     stream:
       - sodium:
-          branch: 'master'
+          branch: 'stable/sodium'
           integration-test: sodium
-      - neon:
-          branch: 'stable/neon'
-          integration-test: neon
-      - fluorine:
-          branch: 'stable/fluorine'
-          integration-test: fluorine
-      - oxygen:
-          branch: 'stable/oxygen'
-          integration-test: oxygen
-          disable-job: 'true'
 
     project: releng/autorelease
     project-name: autorelease
@@ -56,12 +46,18 @@
     jobs:
       - 'autorelease-release-{stream}-{mvn-version}-{java-version}':
           build-node: centos7-autorelease-4c-16g
+      - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}':
 
     stream:
-      - sodium:
+      - aluminium:
           branch: 'master'
-          integration-test: sodium
-          java-version: openjdk11
+          integration-test: aluminium
+      - magnesium:
+          branch: 'stable/magnesium'
+          integration-test: magnesium
+      - sodium:
+          branch: 'stable/sodium'
+          integration-test: sodium-dev-null
 
     project: releng/autorelease
     project-name: autorelease
@@ -83,7 +79,7 @@
         -Dcheckstyle.skip=true
         -Dskip.karaf.featureTest=true
         -Dsft.heap.max=4g
-    java-version: openjdk8
+    java-version: 'openjdk11'
 
 - project:
     name: autorelease-view