Skip to content

Commit

Permalink
Enable delete_branch_on_merge for AQA test repos
Browse files Browse the repository at this point in the history
resolves: adoptium/aqa-tests#5776

Signed-off-by: Lan Xia <[email protected]>
  • Loading branch information
llxia committed Dec 4, 2024
1 parent b1fe2c3 commit 2260822
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions otterdog/adoptium.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down Expand Up @@ -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+: [
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 2260822

Please sign in to comment.