Merge "Revert "Add a swap file to build machines""

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

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index c2c355b2ed39fe6eed0a88cded7eea7835435cde..9e6bc1e47f876b997b66e60e68d4f19b42216872 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -3,44 +3,39 @@
     name: autorelease-projects
     jobs:
       - 'autorelease-generate-release-notes-{stream}'
-      - 'autorelease-release-{stream}'
+      - 'autorelease-release-{stream}':
+          build-node: centos7-autorelease-4c-16g
       - 'autorelease-update-validate-jobs-{stream}'
-      - 'autorelease-version-bump-{stream}'
+      - 'autorelease-version-bump-{stream}':
+          build-node: centos7-autorelease-4c-16g
       - '{project-name}-validate-autorelease-{stream}'
       - gerrit-tox-verify
 
-    # todo: After boron EOL remove next-release-tag and directy pass
+    # todo: After Carbon EOL remove next-release-tag and directy pass
     # '{stream}' to autorelease-release-tag parameter
     stream:
       - oxygen:
           next-release-tag: '{stream}'
           branch: 'master'
-          jdk: 'openjdk8'
           integration-test: oxygen
+          extra-mvn-opts: -Dsft.heap.max=4g
       - nitrogen:
           next-release-tag: '{stream}'
           branch: 'stable/nitrogen'
-          jdk: 'openjdk8'
           integration-test: nitrogen
+          extra-mvn-opts: -Dsft.heap.max=4g
       - carbon:
+          # Run once a week now that Nitrogen is released and Oxygen is in active development
+          cron: 'H 12 * * 0'
           next-release-tag: '{stream}'
           branch: 'stable/carbon'
-          jdk: 'openjdk8'
           integration-test: carbon
           karaf-version: karaf3
           extra-mvn-opts: -Dskip.karaf4.featureTest=true
-      - boron:
-          # Only run once a week since Boron is in maintenance mode
-          cron: 'H 12 * * 0'
-          next-release-tag: Boron-SR5
-          branch: 'stable/boron'
-          jdk: 'openjdk8'
-          integration-test: boron
-          karaf-version: karaf3
 
     project: releng/autorelease
     project-name: autorelease
-    build-node: centos7-java-builder-2c-4g
+    build-node: centos7-builder-2c-8g
     # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
     archive-artifacts: >
         **/*.prop
@@ -49,4 +44,4 @@
         **/target/failsafe-reports/failsafe-summary.xml
         **/hs_err_*.log
         **/target/feature/feature.xml
-        **/*.hprof
+    # TODO: **/*.hprof is too large, compress with xz first