X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-projects.yaml;h=ff1de8f89eae656aae4fa3d6b9dc47017ddb3926;hb=ed9ae53d4c23b42ba64e81db13edc60a36f308bb;hp=fd60982114c993c5008c3b6c86a5dd084ec3f524;hpb=fb9297d20fe434066a9c84064d79cf9daf89dda2;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index fd6098211..ff1de8f89 100644
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -1,60 +1,52 @@
 ---
 - project:
-    name: autorelease-projects-openjdk11
+    name: autorelease-projects-common
     jobs:
       - autorelease-branch-cut
-      - "autorelease-generate-release-notes-{stream}"
-      - "autorelease-release-{stream}-{mvn-version}-{java-version}":
-          build-node: centos7-builder-4c-16g
       - "autorelease-update-submodules-{stream}"
       - "autorelease-update-validate-jobs-{stream}"
       - "{project-name}-validate-autorelease-{stream}"
-      - "autorelease-version-bump-{stream}-{mvn-version}-{java-version}"
       - gerrit-tox-verify
 
     stream:
-      - chlorine:
+      - calcium:
           branch: "master"
-          integration-test: chlorine
-      - sulfur:
-          branch: "stable/sulfur"
-          integration-test: sulfur
-      - phosphorus:
-          branch: "stable/phosphorus"
-          integration-test: phosphorus
+      - potassium:
+          branch: "stable/potassium"
+      - argon:
+          branch: "stable/argon"
+      - chlorine:
+          branch: "stable/chlorine"
 
     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
+    build-node: centos8-builder-2c-2g
     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: >
-      -PrepoBuild
-      -P!karaf
-      -Pignore-lispflowmapping-integrationtest
-      -Dcheckstyle.skip=true
-      -Dskip.karaf.featureTest=true
-      -Dsft.heap.max=4g
-    java-version: "openjdk11"
 
 - project:
     name: autorelease-projects-openjdk17
     jobs:
       - "autorelease-release-{stream}-{mvn-version}-{java-version}":
           build-node: centos8-builder-4c-16g
+      - "autorelease-version-bump-{stream}-{mvn-version}-{java-version}"
+      - "autorelease-generate-release-notes-{stream}"
 
     stream:
-      - chlorine:
+      - calcium:
           branch: "master"
-          integration-test: chlorine-dev-null
+          integration-test: potassium
+      - potassium:
+          branch: "stable/potassium"
+          integration-test: potassium
+      - argon:
+          branch: "stable/argon"
+          integration-test: argon
+      - chlorine:
+          branch: "stable/chlorine"
+          integration-test: chlorine
 
     project: releng/autorelease
     project-name: autorelease
@@ -76,7 +68,6 @@
       -Dcheckstyle.skip=true
       -Dskip.karaf.featureTest=true
       -Dsft.heap.max=4g
-    java-version: "openjdk17"
 
 - project:
     name: autorelease-info