Merge "Auto Update CSIT Jobs to run for neon"

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

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 7aa4b68e0be5011d2406bff027bed20cabd3f2eb..73e5e234fcd55f9b254e973e93dec9257fdd7145 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -8,38 +8,23 @@
           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
-          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
-              -Dskip.karaf.featureTest=true
       - neon:
           branch: 'stable/neon'
           integration-test: neon
-          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
-              -Dskip.karaf.featureTest=true
-      - fluorine:
-          branch: 'stable/fluorine'
-          integration-test: fluorine
-          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
-              -Dskip.karaf.featureTest=true
-      - oxygen:
-          branch: 'stable/oxygen'
-          integration-test: oxygen
-          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
-              -Dskip.karaf.featureTest=true
-          disable-job: 'true'
+          cron: '@weekly'
 
     project: releng/autorelease
     project-name: autorelease
     build-node: centos7-builder-2c-8g
-    java-version: openjdk8
     # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
     archive-artifacts: >
         **/*.prop
@@ -50,24 +35,37 @@
         **/target/feature/feature.xml
     staging-profile-id: 425e43800fea70
     # TODO: **/*.hprof is too large, compress with xz first
+    mvn-params: >
+        -Pintegrationtests,repoBuild
+        -P!karaf
+        -Pignore-lispflowmapping-integrationtest
+        -Dcheckstyle.skip=true
+        -Dskip.karaf.featureTest=true
+        -Dsft.heap.max=4g
+    java-version: openjdk8
+
 
 - project:
     name: autorelease-projects-openjdk11
     jobs:
       - 'autorelease-release-{stream}-{mvn-version}-{java-version}':
-          build-node: centos7-autorelease-8c-32g
+          build-node: centos7-autorelease-4c-16g
+      - 'autorelease-version-bump-{stream}-{mvn-version}-{java-version}':
 
     stream:
-      - neon:
+      - aluminium:
           branch: 'master'
-          integration-test: neon
-          extra-mvn-opts: -P!karaf -Pignore-lispflowmapping-integrationtest -Dsft.heap.max=4g
-              -Dskip.karaf.featureTest=true
+          integration-test: aluminium-dev-null
+      - magnesium:
+          branch: 'stable/magnesium'
+          integration-test: magnesium-dev-null
+      - sodium:
+          branch: 'stable/sodium'
+          integration-test: sodium-dev-null
 
     project: releng/autorelease
     project-name: autorelease
     build-node: centos7-builder-2c-8g
-    java-version: openjdk11
     # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
     archive-artifacts: >
         **/*.prop
@@ -78,7 +76,14 @@
         **/target/feature/feature.xml
     staging-profile-id: 425e43800fea70
     # TODO: **/*.hprof is too large, compress with xz first
-
+    mvn-params: >
+        -Pintegrationtests,repoBuild
+        -P!karaf
+        -Pignore-lispflowmapping-integrationtest
+        -Dcheckstyle.skip=true
+        -Dskip.karaf.featureTest=true
+        -Dsft.heap.max=4g
+    java-version: 'openjdk11'
 
 - project:
     name: autorelease-view