From 2260822858aa71e7b84f349b3b8c3603c832f82d Mon Sep 17 00:00:00 2001 From: Lan Xia Date: Wed, 4 Dec 2024 10:57:35 -0500 Subject: [PATCH 1/2] Enable delete_branch_on_merge for AQA test repos resolves: https://github.com/adoptium/aqa-tests/issues/5776 Signed-off-by: Lan Xia --- otterdog/adoptium.jsonnet | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/otterdog/adoptium.jsonnet b/otterdog/adoptium.jsonnet index e96785a..35a28d4 100644 --- a/otterdog/adoptium.jsonnet +++ b/otterdog/adoptium.jsonnet @@ -118,14 +118,14 @@ orgs.newOrg('adoptium') { newAQAvitRepo('STF') { allow_update_branch: false, default_branch: "master", - delete_branch_on_merge: false, + delete_branch_on_merge: true, description: "The System Test Framework for executing https://github.com/adoptium/aqa-systemtest", }, newAQAvitRepo('TKG') { allow_merge_commit: true, allow_update_branch: false, default_branch: "master", - delete_branch_on_merge: false, + delete_branch_on_merge: true, description: "TestKitGen (TKG)", branch_protection_rules: [ orgs.newBranchProtectionRule('master'), @@ -291,19 +291,19 @@ orgs.newOrg('adoptium') { newAQAvitRepo('aqa-systemtest') { allow_update_branch: false, default_branch: "master", - delete_branch_on_merge: false, + delete_branch_on_merge: true, description: "Java load testing and other full system application tests", }, newAQAvitRepo('aqa-test-tools') { allow_update_branch: false, default_branch: "master", - delete_branch_on_merge: false, + delete_branch_on_merge: true, description: "Home of Test Results Summary Service (TRSS) and PerfNext. These tools are designed to improve our ability to monitor and triage tests at the Adoptium project. The code is generic enough that it is extensible for use by any project that needs to monitor multiple CI servers and aggregate their results.", }, newAQAvitRepo('aqa-tests') { allow_update_branch: false, default_branch: "master", - delete_branch_on_merge: false, + delete_branch_on_merge: true, description: "Home of test infrastructure for Adoptium builds", homepage: "https://adoptium.net/aqavit", topics+: [ @@ -695,7 +695,7 @@ orgs.newOrg('adoptium') { allow_merge_commit: true, allow_update_branch: false, default_branch: "master", - delete_branch_on_merge: false, + delete_branch_on_merge: true, dependabot_security_updates_enabled: true, description: "Long running J9 tests", private_vulnerability_reporting_enabled: true, From 881cc219a3c7f5488404119e45ce01de7063f298 Mon Sep 17 00:00:00 2001 From: Thomas Neidhart Date: Wed, 4 Dec 2024 17:01:20 +0100 Subject: [PATCH 2/2] Remove redundant setting Signed-off-by: Thomas Neidhart --- otterdog/adoptium.jsonnet | 6 ------ 1 file changed, 6 deletions(-) diff --git a/otterdog/adoptium.jsonnet b/otterdog/adoptium.jsonnet index 35a28d4..efbd3b5 100644 --- a/otterdog/adoptium.jsonnet +++ b/otterdog/adoptium.jsonnet @@ -118,14 +118,12 @@ orgs.newOrg('adoptium') { newAQAvitRepo('STF') { allow_update_branch: false, default_branch: "master", - delete_branch_on_merge: true, description: "The System Test Framework for executing https://github.com/adoptium/aqa-systemtest", }, newAQAvitRepo('TKG') { allow_merge_commit: true, allow_update_branch: false, default_branch: "master", - delete_branch_on_merge: true, description: "TestKitGen (TKG)", branch_protection_rules: [ orgs.newBranchProtectionRule('master'), @@ -291,19 +289,16 @@ orgs.newOrg('adoptium') { newAQAvitRepo('aqa-systemtest') { allow_update_branch: false, default_branch: "master", - delete_branch_on_merge: true, description: "Java load testing and other full system application tests", }, newAQAvitRepo('aqa-test-tools') { allow_update_branch: false, default_branch: "master", - delete_branch_on_merge: true, description: "Home of Test Results Summary Service (TRSS) and PerfNext. These tools are designed to improve our ability to monitor and triage tests at the Adoptium project. The code is generic enough that it is extensible for use by any project that needs to monitor multiple CI servers and aggregate their results.", }, newAQAvitRepo('aqa-tests') { allow_update_branch: false, default_branch: "master", - delete_branch_on_merge: true, description: "Home of test infrastructure for Adoptium builds", homepage: "https://adoptium.net/aqavit", topics+: [ @@ -695,7 +690,6 @@ orgs.newOrg('adoptium') { allow_merge_commit: true, allow_update_branch: false, default_branch: "master", - delete_branch_on_merge: true, dependabot_security_updates_enabled: true, description: "Long running J9 tests", private_vulnerability_reporting_enabled: true,