Fix extra-mvn-opts not passed into autorelease

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

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index d9966511b5d8ff7d13b86d0e00bf8008ff65cdff..8252fb3cabea294fddc1f983d8a8029aaf9361b8 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -4,8 +4,9 @@
     jobs:
       - autorelease-branch-cut
       - 'autorelease-generate-release-notes-{stream}'
-      - 'autorelease-release-{stream}':
+      - 'autorelease-release-{stream}-{mvn-version}-{java-version}':
           build-node: centos7-autorelease-4c-16g
+      - 'autorelease-update-submodules-{stream}'
       - 'autorelease-update-validate-jobs-{stream}'
       - 'autorelease-version-bump-{stream}':
           build-node: centos7-autorelease-4c-16g
@@ -13,14 +14,51 @@
       - gerrit-tox-verify
 
     stream:
-      - fluorine:
+      - sodium:
           branch: 'master'
+          integration-test: sodium
+          mvn-params: >
+              -Pintegrationtests,repoBuild
+              -P!karaf
+              -Pignore-lispflowmapping-integrationtest
+              -Dcheckstyle.skip=true
+              -Dskip.karaf.featureTest=true
+              -Dsft.heap.max=4g
+          java-version: openjdk11
+      - neon:
+          branch: 'stable/neon'
+          integration-test: neon
+          mvn-params: >
+              -Pintegrationtests,repoBuild
+              -P!karaf
+              -Pignore-lispflowmapping-integrationtest
+              -Dcheckstyle.skip=true
+              -Dskip.karaf.featureTest=true
+              -Dsft.heap.max=4g
+          java-version: openjdk8
+      - fluorine:
+          branch: 'stable/fluorine'
           integration-test: fluorine
-          extra-mvn-opts: -P!karaf -Dsft.heap.max=4g -Dskip.karaf.featureTest=true
+          mvn-params: >
+              -Pintegrationtests,repoBuild
+              -P!karaf
+              -Pignore-lispflowmapping-integrationtest
+              -Dcheckstyle.skip=true
+              -Dskip.karaf.featureTest=true
+              -Dsft.heap.max=4g
+          java-version: openjdk8
       - oxygen:
           branch: 'stable/oxygen'
           integration-test: oxygen
-          extra-mvn-opts: -P!karaf -Dsft.heap.max=4g -Dskip.karaf.featureTest=true
+          mvn-params: >
+              -Pintegrationtests,repoBuild
+              -P!karaf
+              -Pignore-lispflowmapping-integrationtest
+              -Dcheckstyle.skip=true
+              -Dskip.karaf.featureTest=true
+              -Dsft.heap.max=4g
+          disable-job: 'true'
+          java-version: openjdk8
 
     project: releng/autorelease
     project-name: autorelease
@@ -33,4 +71,11 @@
         **/target/failsafe-reports/failsafe-summary.xml
         **/hs_err_*.log
         **/target/feature/feature.xml
+    staging-profile-id: 425e43800fea70
     # TODO: **/*.hprof is too large, compress with xz first
+
+- project:
+    name: autorelease-view
+    views:
+      - project-view
+    project-name: autorelease