From b807ea712f3a238910094239fbe3f2bb770662b2 Mon Sep 17 00:00:00 2001 From: George Adams Date: Thu, 19 Oct 2023 14:50:52 +0100 Subject: [PATCH 1/5] Add marketplace repo Signed-off-by: George Adams --- otterdog/adoptium.jsonnet | 55 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/otterdog/adoptium.jsonnet b/otterdog/adoptium.jsonnet index d2424af..58cc3fd 100644 --- a/otterdog/adoptium.jsonnet +++ b/otterdog/adoptium.jsonnet @@ -264,6 +264,61 @@ orgs.newOrg('adoptium') { }, ], }, + orgs.newRepo('marketplace-api.adoptium.net') { + allow_merge_commit: true, + allow_squash_merge: false, + allow_update_branch: false, + delete_branch_on_merge: false, + dependabot_alerts_enabled: false, + description: "Adoptium Marketplace API 🚀", + homepage: "https://marketplace-api.adoptium.net", + topics+: [ + "adoptium", + "api", + "hacktoberfest", + "java", + "openjdk", + "restful-api", + "swagger", + "temurin" + ], + web_commit_signoff_required: false, + workflows+: { + allowed_actions: "selected", + default_workflow_permissions: "write", + }, + secrets: [ + orgs.newRepoSecret('AZURE_CLIENT_ID') { + value: "pass:bots/adoptium/azure/azure-client-id", + }, + orgs.newRepoSecret('AZURE_CLIENT_ID_OIDC') { + value: "pass:bots/adoptium/azure/azure-client-id-oidc", + }, + orgs.newRepoSecret('AZURE_CLIENT_SECRET') { + value: "pass:bots/adoptium/azure/azure-client-secret", + }, + orgs.newRepoSecret('AZURE_SUBSCRIPTION_ID') { + value: "pass:bots/adoptium/azure/azure-subscription-id", + }, + orgs.newRepoSecret('AZURE_TENANT_ID') { + value: "pass:bots/adoptium/azure/azure-tenant-id", + }, + ], + branch_protection_rules: [ + orgs.newBranchProtectionRule('production') { + required_approving_review_count: 1, + required_status_checks+: [ + "build" + ], + }, + orgs.newBranchProtectionRule('main') { + required_approving_review_count: 1, + required_status_checks+: [ + "build" + ], + }, + ], + }, orgs.newRepo('aqa-systemtest') { allow_update_branch: false, default_branch: "master", From a7194edde5182bd00c18432d9dd7b8ce2d200b24 Mon Sep 17 00:00:00 2001 From: George Adams Date: Thu, 19 Oct 2023 14:59:29 +0100 Subject: [PATCH 2/5] Update adoptium.jsonnet Signed-off-by: George Adams --- otterdog/adoptium.jsonnet | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/otterdog/adoptium.jsonnet b/otterdog/adoptium.jsonnet index 58cc3fd..75e148b 100644 --- a/otterdog/adoptium.jsonnet +++ b/otterdog/adoptium.jsonnet @@ -304,20 +304,6 @@ orgs.newOrg('adoptium') { value: "pass:bots/adoptium/azure/azure-tenant-id", }, ], - branch_protection_rules: [ - orgs.newBranchProtectionRule('production') { - required_approving_review_count: 1, - required_status_checks+: [ - "build" - ], - }, - orgs.newBranchProtectionRule('main') { - required_approving_review_count: 1, - required_status_checks+: [ - "build" - ], - }, - ], }, orgs.newRepo('aqa-systemtest') { allow_update_branch: false, From 7d878bec037dc5e1817d1b53f0ddbf62d1c4ba9b Mon Sep 17 00:00:00 2001 From: George Adams Date: Thu, 19 Oct 2023 15:16:26 +0100 Subject: [PATCH 3/5] Update adoptium.jsonnet Signed-off-by: George Adams --- otterdog/adoptium.jsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/otterdog/adoptium.jsonnet b/otterdog/adoptium.jsonnet index 75e148b..5b08ecc 100644 --- a/otterdog/adoptium.jsonnet +++ b/otterdog/adoptium.jsonnet @@ -264,7 +264,7 @@ orgs.newOrg('adoptium') { }, ], }, - orgs.newRepo('marketplace-api.adoptium.net') { + orgs.newRepo('marketplace-api.adoptium.net') { allow_merge_commit: true, allow_squash_merge: false, allow_update_branch: false, From 20b47c3f195fea43edcbe1acd1e9e6a1464656d0 Mon Sep 17 00:00:00 2001 From: George Adams Date: Thu, 19 Oct 2023 15:45:45 +0100 Subject: [PATCH 4/5] Update otterdog/adoptium.jsonnet Co-authored-by: Tim Ellison Signed-off-by: George Adams --- otterdog/adoptium.jsonnet | 1 + 1 file changed, 1 insertion(+) diff --git a/otterdog/adoptium.jsonnet b/otterdog/adoptium.jsonnet index 5b08ecc..5bf96cc 100644 --- a/otterdog/adoptium.jsonnet +++ b/otterdog/adoptium.jsonnet @@ -270,6 +270,7 @@ orgs.newOrg('adoptium') { allow_update_branch: false, delete_branch_on_merge: false, dependabot_alerts_enabled: false, + dependabot_security_updates_enabled: true, description: "Adoptium Marketplace API 🚀", homepage: "https://marketplace-api.adoptium.net", topics+: [ From 4be3d6cb7b417482962ddff9c557bea1ff5df8f6 Mon Sep 17 00:00:00 2001 From: Thomas Neidhart Date: Thu, 19 Oct 2023 21:15:05 +0200 Subject: [PATCH 5/5] Enable dependabot alerts Signed-off-by: Thomas Neidhart --- otterdog/adoptium.jsonnet | 1 - 1 file changed, 1 deletion(-) diff --git a/otterdog/adoptium.jsonnet b/otterdog/adoptium.jsonnet index 5bf96cc..f4dfff4 100644 --- a/otterdog/adoptium.jsonnet +++ b/otterdog/adoptium.jsonnet @@ -269,7 +269,6 @@ orgs.newOrg('adoptium') { allow_squash_merge: false, allow_update_branch: false, delete_branch_on_merge: false, - dependabot_alerts_enabled: false, dependabot_security_updates_enabled: true, description: "Adoptium Marketplace API 🚀", homepage: "https://marketplace-api.adoptium.net",