From 1cd640eaef02fc8f45999769a869fb835775fd7b Mon Sep 17 00:00:00 2001 From: Sangwook Ha Date: Mon, 6 Feb 2023 11:00:56 -0800 Subject: [PATCH] Refactor autorelease projects Create a project for the common jobs which do not depend on the Java version. This allows the jobs to run on the same build node regardless of the stream or its Java version. Change-Id: Id49fe99f1cf1553e114665c8b45849867bfb25de Signed-off-by: Sangwook Ha --- jjb/autorelease/autorelease-projects.yaml | 28 +++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 701b5fabab..9804795d50 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -1,17 +1,37 @@ --- - 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: + - argon: + branch: "master" + - chlorine: + branch: "stable/chlorine" + - sulfur: + branch: "stable/sulfur" + + project: releng/autorelease + project-name: autorelease + build-node: centos7-builder-2c-2g + archive-artifacts: > + **/*.prop + **/*.log + staging-profile-id: 425e43800fea70 + +- project: + name: autorelease-projects-openjdk11 + jobs: + - "autorelease-release-{stream}-{mvn-version}-{java-version}": + build-node: centos7-builder-4c-16g + - "autorelease-version-bump-{stream}-{mvn-version}-{java-version}" + stream: - sulfur: branch: "stable/sulfur" -- 2.36.6