From 41ae1dd1ead20b41da4089b09e75aabfc630fc93 Mon Sep 17 00:00:00 2001 From: Rob Lemley Date: Wed, 20 Nov 2024 08:34:03 +0200 Subject: [PATCH] Bug 1927881 - Enable (most) remaining tasks for monthly releases. r=coreycb This is everything ~~except Snap and Flatpak repackaging.~~ Flatpak repackaging (//not// pushing) and Snap repackaging are now included. -Daniel Differential Revision: https://phabricator.services.mozilla.com/D227269 --HG-- extra : amend_source : b5f77a2cdca5369b79bd1755c582f0da74df1614 --- taskcluster/kinds/release-final-verify/kind.yml | 1 - taskcluster/kinds/release-flatpak-repackage/kind.yml | 5 +++-- .../kinds/release-notify-av-announce/kind.yml | 2 +- taskcluster/kinds/release-notify-promote/kind.yml | 2 +- taskcluster/kinds/release-notify-push/kind.yml | 2 +- taskcluster/kinds/release-notify-ship/kind.yml | 2 +- taskcluster/kinds/release-push-langpacks/kind.yml | 12 +----------- taskcluster/kinds/release-snap-repackage/kind.yml | 2 +- .../kinds/release-update-verify-config/kind.yml | 1 - taskcluster/kinds/release-update-verify/kind.yml | 1 - taskcluster/kinds/release-version-bump/kind.yml | 6 +++--- taskcluster/kinds/repackage-l10n/kind.yml | 2 +- 12 files changed, 13 insertions(+), 25 deletions(-) diff --git a/taskcluster/kinds/release-final-verify/kind.yml b/taskcluster/kinds/release-final-verify/kind.yml index 24283eac66..77d90d35aa 100644 --- a/taskcluster/kinds/release-final-verify/kind.yml +++ b/taskcluster/kinds/release-final-verify/kind.yml @@ -18,7 +18,6 @@ transforms: task-defaults: name: final-verify run-on-projects: [] # to make sure this never runs as part of CI - run-on-releases: [beta, esr128] # Remove after shipping first comm-release worker-type: b-linux-gcp worker: docker-image: diff --git a/taskcluster/kinds/release-flatpak-repackage/kind.yml b/taskcluster/kinds/release-flatpak-repackage/kind.yml index db9dc5a7af..110c27589b 100644 --- a/taskcluster/kinds/release-flatpak-repackage/kind.yml +++ b/taskcluster/kinds/release-flatpak-repackage/kind.yml @@ -18,7 +18,7 @@ kind-dependencies: task-defaults: description: Generates flatpak by repackaging the existing .tar.bz2 run-on-projects: [] # to make sure this never runs as part of CI - run-on-releases: [beta, esr128] + run-on-releases: [beta, release, esr128] shipping-phase: promote scopes: [] package-locales-file: comm/mail/locales/onchange-locales @@ -59,12 +59,13 @@ task-defaults: LANG: C.UTF-8 FLATPAK_BRANCH: by-project: - comm-esr.*: stable + comm-(release|esr.*): stable default: beta MANIFEST_URL: "{config_params[comm_head_repository]}/file/{config_params[comm_head_rev]}/taskcluster/docker/tb-flatpak/repack.sh" RELEASE_NOTES_URL: by-project: comm-esr.*: "https://www.thunderbird.net/en-US/thunderbird/{config_params[app_version]}esr/releasenotes/" + comm-release: "https://www.thunderbird.net/en-US/thunderbird/{config_params[app_version]}/releasenotes/" default: "https://www.thunderbird.net/en-US/thunderbird/{config_params[app_version]}beta/releasenotes/" chain-of-trust: true diff --git a/taskcluster/kinds/release-notify-av-announce/kind.yml b/taskcluster/kinds/release-notify-av-announce/kind.yml index 8c9b23244c..8c9856a3ac 100644 --- a/taskcluster/kinds/release-notify-av-announce/kind.yml +++ b/taskcluster/kinds/release-notify-av-announce/kind.yml @@ -29,7 +29,7 @@ task-defaults: Product location: https://releases.mozilla.org/pub/{task[shipping-product]}/candidates/{release_config[version]}-candidates/build{release_config[build_number]}/ emails: by-project: - comm-(beta|esr.*): ["av-vendor-release-announce@mozilla.org"] + comm-(beta|release|esr.*): ["av-vendor-release-announce@mozilla.org"] try-comm-central: ["{config[params][owner]}"] default: [] diff --git a/taskcluster/kinds/release-notify-promote/kind.yml b/taskcluster/kinds/release-notify-promote/kind.yml index ec563e5aad..e4309ec9fa 100644 --- a/taskcluster/kinds/release-notify-promote/kind.yml +++ b/taskcluster/kinds/release-notify-promote/kind.yml @@ -26,7 +26,7 @@ task-defaults: message: "{task[shipping-product]} {release_config[version]} build{release_config[build_number]}/{config[params][project]} is in the candidates directory" emails: by-project: - comm-(beta|esr.*): ["thunderbird-drivers@mozilla.org"] + comm-(beta|release|esr.*): ["thunderbird-drivers@mozilla.org"] try-comm-central: ["{config[params][owner]}"] default: [] diff --git a/taskcluster/kinds/release-notify-push/kind.yml b/taskcluster/kinds/release-notify-push/kind.yml index 7af4d9d6f3..dcbc05f4ce 100644 --- a/taskcluster/kinds/release-notify-push/kind.yml +++ b/taskcluster/kinds/release-notify-push/kind.yml @@ -23,7 +23,7 @@ task-defaults: message: "{task[shipping-product]} {release_config[version]} build{release_config[build_number]}/{config[params][project]} has been pushed to cdntest" emails: by-project: - comm-(beta|esr.*): ["thunderbird-drivers@mozilla.org"] + comm-(beta|release|esr.*): ["thunderbird-drivers@mozilla.org"] try-comm-central: ["{config[params][owner]}"] default: [] diff --git a/taskcluster/kinds/release-notify-ship/kind.yml b/taskcluster/kinds/release-notify-ship/kind.yml index 5298c14310..342cab0100 100644 --- a/taskcluster/kinds/release-notify-ship/kind.yml +++ b/taskcluster/kinds/release-notify-ship/kind.yml @@ -24,7 +24,7 @@ task-defaults: notifications: emails: by-project: - comm-(beta|esr.*): ["thunderbird-drivers@mozilla.org"] + comm-(beta|release|esr.*): ["thunderbird-drivers@mozilla.org"] try-comm-central: ["{config[params][owner]}"] default: [] diff --git a/taskcluster/kinds/release-push-langpacks/kind.yml b/taskcluster/kinds/release-push-langpacks/kind.yml index 6e6824629b..4540f61069 100644 --- a/taskcluster/kinds/release-push-langpacks/kind.yml +++ b/taskcluster/kinds/release-push-langpacks/kind.yml @@ -29,17 +29,7 @@ tasks: PATH: /builds/worker/bin:/usr/local/bin:/usr/bin:/bin channel: by-project: - comm-esr128: - by-platform: - # ja-JP-mac is only langpack on mac, and is unlisted always - macosx64.*: unlisted - default: listed - comm-release: - by-platform: - # ja-JP-mac is only langpack on mac, and is unlisted always - macosx64.*: unlisted - default: listed - comm-beta: + comm-(beta|release|esr.*): by-platform: # ja-JP-mac is only langpack on mac, and is unlisted always macosx64.*: unlisted diff --git a/taskcluster/kinds/release-snap-repackage/kind.yml b/taskcluster/kinds/release-snap-repackage/kind.yml index c11d698541..aedde72459 100644 --- a/taskcluster/kinds/release-snap-repackage/kind.yml +++ b/taskcluster/kinds/release-snap-repackage/kind.yml @@ -18,7 +18,7 @@ kind-dependencies: task-defaults: description: Generates snap by repackaging the existing .tar.bz2 run-on-projects: [] # to make sure this never runs as part of CI - run-on-releases: [beta, esr128] + run-on-releases: [beta, release, esr128] shipping-phase: promote scopes: [] package-locales-file: comm/mail/locales/onchange-locales diff --git a/taskcluster/kinds/release-update-verify-config/kind.yml b/taskcluster/kinds/release-update-verify-config/kind.yml index a93e1e4a3e..b9096a3d04 100644 --- a/taskcluster/kinds/release-update-verify-config/kind.yml +++ b/taskcluster/kinds/release-update-verify-config/kind.yml @@ -13,7 +13,6 @@ transforms: task-defaults: name: update-verify-config run-on-projects: [] # to make sure this never runs as part of CI - run-on-releases: [beta, esr128] # Remove after shipping first comm-release shipping-phase: promote worker-type: b-linux-gcp worker: diff --git a/taskcluster/kinds/release-update-verify/kind.yml b/taskcluster/kinds/release-update-verify/kind.yml index 4f8daa3738..9bf238b26f 100644 --- a/taskcluster/kinds/release-update-verify/kind.yml +++ b/taskcluster/kinds/release-update-verify/kind.yml @@ -20,7 +20,6 @@ transforms: task-defaults: name: update-verify run-on-projects: [] # to make sure this never runs as part of CI - run-on-releases: [beta, esr128] # Remove after shipping first comm-release shipping-phase: promote worker-type: b-linux-gcp worker: diff --git a/taskcluster/kinds/release-version-bump/kind.yml b/taskcluster/kinds/release-version-bump/kind.yml index eb3c33e558..92bcd83a72 100644 --- a/taskcluster/kinds/release-version-bump/kind.yml +++ b/taskcluster/kinds/release-version-bump/kind.yml @@ -26,14 +26,14 @@ task-defaults: comm-esr.*: false default: true bump-files: - by-project: + by-release-type: default: ["mail/config/version_display.txt"] - comm-beta: + release|esr.*: - "mail/config/version.txt" - "mail/config/version_display.txt" push: by-project: - comm-(beta|esr.*): true + comm-(beta|release|esr.*): true default: false tasks: diff --git a/taskcluster/kinds/repackage-l10n/kind.yml b/taskcluster/kinds/repackage-l10n/kind.yml index 3736fe4e6f..0ee43bc958 100644 --- a/taskcluster/kinds/repackage-l10n/kind.yml +++ b/taskcluster/kinds/repackage-l10n/kind.yml @@ -36,7 +36,7 @@ tasks: debug: shippable-l10n-mac-signing default: by-project: - comm-(central|beta|esr.*): shippable-l10n-mac-notarization + comm-(central|beta|release|esr.*): shippable-l10n-mac-notarization default: shippable-l10n-mac-signing worker-type: 'b-linux-gcp' mozharness: