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 46c75fbb1e23ca3a1377fec16f34a4ceec5add2d..f15d67080271c65d2c404a1690a10d7f05a230e7 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -8,7 +8,7 @@
           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
@@ -17,9 +17,6 @@
       - sodium:
           branch: 'stable/sodium'
           integration-test: sodium
-      - neon:
-          branch: 'stable/neon'
-          integration-test: neon
 
     project: releng/autorelease
     project-name: autorelease
@@ -49,10 +46,14 @@
     jobs:
       - 'autorelease-release-{stream}-{mvn-version}-{java-version}':
           build-node: centos7-autorelease-4c-16g
+      - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}':
 
     stream:
-      - magnesium:
+      - aluminium:
           branch: 'master'
+          integration-test: aluminium
+      - magnesium:
+          branch: 'stable/magnesium'
           integration-test: magnesium
       - sodium:
           branch: 'stable/sodium'
@@ -78,7 +79,7 @@
         -Dcheckstyle.skip=true
         -Dskip.karaf.featureTest=true
         -Dsft.heap.max=4g
-    java-version: openjdk11
+    java-version: 'openjdk11'
 
 - project:
     name: autorelease-view