Remove all Oxygen Jobs.

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

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index f0a200402575c3fbb1e9f102e66f7745318671b9..d60c8cbd750de9a889f743392b0ac025b2a3e3cf 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -4,31 +4,25 @@
     jobs:
       - autorelease-branch-cut
       - 'autorelease-generate-release-notes-{stream}'
-      - 'autorelease-release-{stream}':
-          build-node: centos7-autorelease-8c-32g
+      - '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-8c-32g
+          build-node: centos7-autorelease-4c-16g
       - '{project-name}-validate-autorelease-{stream}'
       - gerrit-tox-verify
 
     stream:
-      - neon:
+      - sodium:
           branch: 'master'
+          integration-test: sodium
+      - 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
 
     project: releng/autorelease
     project-name: autorelease
@@ -41,7 +35,51 @@
         **/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
+    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-4c-16g
+
+    stream:
+      - sodium:
+          branch: 'master'
+          integration-test: sodium
+          java-version: openjdk11
+
+    project: releng/autorelease
+    project-name: autorelease
+    build-node: centos7-builder-2c-8g
+    # Before adding more here, beware of https://jira.linuxfoundation.org/browse/RELENG-280
+    archive-artifacts: >
+        **/*.prop
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+        **/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
+    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-view