Skip to content

Explicitly set mac queue in Buildkite pipeline#23402

Merged
mokagio merged 3 commits intotrunkfrom
mokagio/explicite-queue-mac
Jul 3, 2024
Merged

Explicitly set mac queue in Buildkite pipeline#23402
mokagio merged 3 commits intotrunkfrom
mokagio/explicite-queue-mac

Conversation

@mokagio
Copy link
Contributor

@mokagio mokagio commented Jul 1, 2024

We are DRYing the pipeline upload step in our internal Infrastructure as Code (IaC) setup, see https://github.com/Automattic/buildkite-ci/pull/452/files#r1652113066, which in turns will allow us to do some useful things with metadata, see https://github.com/Automattic/buildkite-ci/pull/459.

However, some pipeline, such as the one here, were configured to set agents: queue: mac at upload time, blocking them from adopting the DRY upload step.

This is PR sets the queue at the pipeline level, making it safe to adopt the standard upload step.

Notice that the the only pipeline file to change is pipeline.yml. The other one already had to explicitly set their agents value because they are all started via API, thus bypassing the default upload step and not inheriting the agents value set in it.

Testing

If CI is green, then we're good.

Regression Notes

  1. Potential unintended areas of impact – N.A.
  2. What I did to test those areas of impact (or what existing automated tests I relied on) – N.A.
  3. What automated tests I added (or what prevented me from doing so) – N.A.

PR submission checklist:

  • I have completed the Regression Notes.
  • I have considered adding unit tests for my changes. N.A.
  • I have considered adding accessibility improvements for my changes. N.A.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary. N.A.

UI changes testing checklist: Not a UI PR.

@mokagio mokagio requested a review from a team July 1, 2024 01:15
@mokagio mokagio added the Tooling Build, Release, and Validation Tools label Jul 1, 2024
@mokagio mokagio added this to the 25.3 milestone Jul 1, 2024
@wpmobilebot
Copy link
Contributor

wpmobilebot commented Jul 1, 2024

WordPress Alpha📲 You can test the changes from this Pull Request in WordPress Alpha by scanning the QR code below to install the corresponding build.
App NameWordPress Alpha WordPress Alpha
ConfigurationRelease-Alpha
Build Numberpr23402-f05f525
Version25.1
Bundle IDorg.wordpress.alpha
Commitf05f525
App Center BuildWPiOS - One-Offs #10252
Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

@wpmobilebot
Copy link
Contributor

wpmobilebot commented Jul 1, 2024

Jetpack Alpha📲 You can test the changes from this Pull Request in Jetpack Alpha by scanning the QR code below to install the corresponding build.
App NameJetpack Alpha Jetpack Alpha
ConfigurationRelease-Alpha
Build Numberpr23402-f05f525
Version25.1
Bundle IDcom.jetpack.alpha
Commitf05f525
App Center Buildjetpack-installable-builds #9301
Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

@AliSoftware
Copy link
Contributor

AliSoftware commented Jul 1, 2024

The other one already had to explicitly set their agents value because they are all started via API, thus bypassing the default upload step and not inheriting the agents value set in it.

This is not technically true. When we start a build via API, it still runs the root steps of the pipeline, i.e. the steps set in the .tf file. It's just that the API call we do also sets the PIPELINE env var to the name of the yml file we want to upload, and since the steps set in the .tf file look like buildkite-agent pipeline upload ${PIPELINE:-pipeline.yml}, then that pipeline upload command will upload the provided YML file set by PIPELINE instead of uploading the default pipeline.yml file when that env var is not set (e.g. like it does on a regular build triggered by commit push).

So TL;DR the default upload steps in the .tf are still run (and not bypassed as you suggest) even during builds triggered by API calls. So if e.g. we were to keep agents: in the steps of the .tf and remove it from all the .yml pipelines (even the ones triggered by API), this would still work (not that it's what we want to do, on the contrary, but just saying to illustrate the point)

Copy link
Contributor

@AliSoftware AliSoftware left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see that .buildkite/release-builds.yml is missing an explicit agents: so we need to add it there too.

(I checked all the other ones and they're good, so it's the only remaining one we need to fix)

@mokagio
Copy link
Contributor Author

mokagio commented Jul 3, 2024

This is not technically true

Right! Thank you for the clarification. I should have consulted the API docs.

See #23402 (review)

Co-authored-by: Olivier Halligon <olivier.halligon@automattic.com>
@mokagio mokagio requested a review from AliSoftware July 3, 2024 02:12
@AliSoftware
Copy link
Contributor

AliSoftware commented Jul 3, 2024

Side note that you'll have to make sure this change is cherry picked to all existing open branches — in particular release/* too — before you can remove it from the .tf!

@mokagio mokagio merged commit e0fd9fd into trunk Jul 3, 2024
@mokagio mokagio deleted the mokagio/explicite-queue-mac branch July 3, 2024 05:08
jkmassel added a commit that referenced this pull request Jul 5, 2024
commit e0fd9fd
Author: Gio Lodi <gio.lodi@automattic.com>
Date:   Wed Jul 3 15:08:20 2024 +1000

    Explicitly set mac queue in Buildkite pipeline (#23402)

commit 312df0f
Author: Gio Lodi <gio.lodi@automattic.com>
Date:   Mon Jul 1 17:37:37 2024 +1000

    Bump Fastlane `xcodebuild -showBuildSettings` interval (#23403)

    This is an attempt to avoid timeouts, mostly in CI.

commit bae5a91
Author: WordPress Mobile Bot Account <mobile+wpmobilebot@automattic.com>
Date:   Thu Jun 27 09:08:50 2024 +1000

    Merge 25.1 release finalization (#23391)

    * Fix announcement card keep showing up after tapping Done (#23384)

    * Update app translations – `Localizable.strings`

    * Update WordPress metadata translations

    * Update Jetpack metadata translations

    * Bump version number

    ---------

    Co-authored-by: David Christiandy <1299411+dvdchr@users.noreply.github.com>

commit c508e4f
Author: Alex Grebenyuk <alex.grebenyuk@automattic.com>
Date:   Tue Jun 25 23:47:11 2024 -0400

    Remove AlamofireNetworkActivityIndicator (#23385)

commit 7bc34eb
Author: kean <grebenyuk.alexander@gmail.com>
Date:   Tue Jun 25 11:00:32 2024 -0400

    Remove deprecated in JetpackBrandingVisibility.enabled

commit 9c8ff9a
Author: kean <grebenyuk.alexander@gmail.com>
Date:   Tue Jun 25 10:58:55 2024 -0400

    Fix more warnings

commit 55e0cd4
Author: kean <grebenyuk.alexander@gmail.com>
Date:   Tue Jun 25 10:53:34 2024 -0400

    Fix warnings in CachedAsyncImage

commit 1f78c63
Author: kean <grebenyuk.alexander@gmail.com>
Date:   Tue Jun 25 10:51:42 2024 -0400

    Fix warnings in MemoryCache

commit 9d86b6b
Author: Povilas Staskus <povilas.staskus@automattic.com>
Date:   Tue Jun 25 09:06:16 2024 +0200

    Support editing media metadata via XML-RPC #809 (#23316)

    * Support media metadata editing for XML-RPC connected self-hosted sites

    - Updated WordPressKit supports editing title, description, and caption of the media via XML-RPC
    - XML-RPC API doesn't support editing alt-text

    * Support editing media metadata via XMLRPC in MediaService

    Media is a type of a post therefore "wp.editPost" can be used to edit media metadata. Note that alternative text cannot be edited due to lack of XML-RPC support https://core.trac.wordpress.org/ticket/58582

    * Update RELEASE-NOTES.txt

commit d8a1348
Author: Povilas Staskus <povilas.staskus@automattic.com>
Date:   Tue Jun 25 09:05:13 2024 +0200

    Add unique identifier to file downloads rows (#23310)

    File Downloads data can be identical which can result in a rare duplicate diffable data source identifiers crash. Pass a unique identifier to ensure that each file downloads row is treated as unique.

commit 09137d3
Merge: fc50d1a c88e54a
Author: Jeremy Massel <1123407+jkmassel@users.noreply.github.com>
Date:   Mon Jun 24 14:16:17 2024 -0600

    Reduce App Size – Assets (#23381)

commit fc50d1a
Merge: 2270784 32a3251
Author: Jeremy Massel <1123407+jkmassel@users.noreply.github.com>
Date:   Mon Jun 24 14:15:55 2024 -0600

    Remove Stories and Kanvas dependency (#23382)

commit 2270784
Merge: 2ee755c f76856a
Author: Jeremy Massel <1123407+jkmassel@users.noreply.github.com>
Date:   Mon Jun 24 13:50:40 2024 -0600

    Update rubocop.yml (#23383)

commit f76856a
Author: kean <grebenyuk.alexander@gmail.com>
Date:   Mon Jun 24 15:27:29 2024 -0400

    Update rubocop.yml

commit 32a3251
Author: kean <grebenyuk.alexander@gmail.com>
Date:   Mon Jun 24 13:52:46 2024 -0400

    Remove Kanvas pod

commit c93087b
Author: kean <grebenyuk.alexander@gmail.com>
Date:   Mon Jun 24 13:30:10 2024 -0400

    Remove StoriesIntroViewController

commit e64e98d
Author: kean <grebenyuk.alexander@gmail.com>
Date:   Mon Jun 24 13:25:40 2024 -0400

    Replace remaining Kanvas usages

commit 3ec3d0d
Author: kean <grebenyuk.alexander@gmail.com>
Date:   Mon Jun 24 12:26:35 2024 -0400

    Remove StoryEditor

commit 4b66f07
Author: kean <grebenyuk.alexander@gmail.com>
Date:   Mon Jun 24 12:17:06 2024 -0400

    Remove Kanvas related code

commit 4812e5b
Author: kean <grebenyuk.alexander@gmail.com>
Date:   Mon Jun 24 12:13:48 2024 -0400

    Remove remaining Kanvas related code

commit f7743b6
Author: kean <grebenyuk.alexander@gmail.com>
Date:   Mon Jun 24 12:11:30 2024 -0400

    Remove custom fonts used by Kanvas

commit c88e54a
Author: kean <grebenyuk.alexander@gmail.com>
Date:   Mon Jun 24 10:44:12 2024 -0400

    Replace JPBackground with tiny-fied icons

commit a9d80c8
Author: kean <grebenyuk.alexander@gmail.com>
Date:   Mon Jun 24 10:33:29 2024 -0400

    Reduce rppreview size

commit ac82126
Author: kean <grebenyuk.alexander@gmail.com>
Date:   Mon Jun 24 10:27:29 2024 -0400

    Remove unused site creation icons

commit 5b8a5a3
Author: kean <grebenyuk.alexander@gmail.com>
Date:   Mon Jun 24 10:21:00 2024 -0400

    Remove Stories related files

commit 6f98ffd
Author: kean <grebenyuk.alexander@gmail.com>
Date:   Mon Jun 24 10:19:06 2024 -0400

    Move JPBackground to AppImage specific to the Jetpack app

commit dd78ad7
Author: kean <grebenyuk.alexander@gmail.com>
Date:   Mon Jun 24 10:09:20 2024 -0400

    JPBackground as png

commit 2ee755c
Merge: 81bc1c5 3835956
Author: Alex Grebenyuk <alex.grebenyuk@automattic.com>
Date:   Fri Jun 21 10:13:38 2024 -0400

    Fix rare crash in GutenbergWebViewController (#23379)

commit 81bc1c5
Merge: 6dc78ec 465047a
Author: Povilas Staskus <povilas.staskus@automattic.com>
Date:   Fri Jun 21 13:30:39 2024 +0300

    Stats: Improve scrolling performance  (#22847)

commit 465047a
Merge: bc88b72 6dc78ec
Author: Povilas Staskus <povilas.staskus@automattic.com>
Date:   Fri Jun 21 11:00:43 2024 +0300

    Merge branch 'trunk' into task/22721-stats-traffic-improve-scrolling-performance

commit bc88b72
Author: Povilas Staskus <povilas.staskus@automattic.com>
Date:   Fri Jun 21 10:57:00 2024 +0300

    Put analyticsTracker back since it's used by JetpackBanner

commit 1b8bc1c
Author: Povilas Staskus <povilas.staskus@automattic.com>
Date:   Fri Jun 21 10:52:21 2024 +0300

    Create StatsRowsCell with default child stack view rows and ability to configure more

commit 89fd816
Author: Povilas Staskus <povilas.staskus@automattic.com>
Date:   Fri Jun 21 10:28:28 2024 +0300

    Make maximum content size category smaller for stats cell subtitles

commit 51992ab
Author: Povilas Staskus <povilas.staskus@automattic.com>
Date:   Fri Jun 21 10:28:01 2024 +0300

    Remove force layout calls when setting subtitle visibility

    These calls were added together with dynamic type support, however, they slow down layout process of the cell

commit 3835956
Author: kean <grebenyuk.alexander@gmail.com>
Date:   Thu Jun 20 10:27:02 2024 -0400

    Update release notes

commit 26bd9b3
Author: kean <grebenyuk.alexander@gmail.com>
Date:   Thu Jun 20 10:23:16 2024 -0400

    Fix rare crash in GutenbergWebViewController

commit 7684a35
Author: Povilas Staskus <povilas.staskus@automattic.com>
Date:   Thu Jun 20 10:48:25 2024 +0300

    Move additional checks for adding default rows into the extension

commit 25bf46d
Author: Povilas Staskus <povilas.staskus@automattic.com>
Date:   Wed Jun 19 13:47:26 2024 +0300

    Update RELEASE-NOTES

commit 8884f81
Merge: 2674401 1c05916
Author: Povilas Staskus <povilas.staskus@automattic.com>
Date:   Wed Jun 19 13:35:52 2024 +0300

    Merge branch 'trunk' into task/22721-stats-traffic-improve-scrolling-performance

commit 2674401
Author: Povilas Staskus <povilas.staskus@automattic.com>
Date:   Thu Apr 11 15:57:07 2024 +0300

    Update CountriesCell to use setNeedsLayout for more efficiency

commit eb7c142
Author: Povilas Staskus <povilas.staskus@automattic.com>
Date:   Thu Apr 11 15:45:56 2024 +0300

    Update TopTotalsCell to use setNeedsLayout for more efficiency

commit d0af997
Author: Povilas Staskus <povilas.staskus@automattic.com>
Date:   Wed Apr 10 11:40:38 2024 +0300

    Update RELEASE-NOTES.txt

commit 8fb2eb4
Merge: 9252c6f d79aa28
Author: Povilas Staskus <povilas.staskus@automattic.com>
Date:   Wed Apr 10 10:07:24 2024 +0300

    Merge branch 'trunk' into task/22721-stats-traffic-improve-scrolling-performance

commit 9252c6f
Author: Povilas Staskus <povilas.staskus@automattic.com>
Date:   Mon Mar 18 17:05:19 2024 +0200

    Do not track StatsTraffic tableView scrolling

commit 9880cb7
Author: Povilas Staskus <povilas.staskus@automattic.com>
Date:   Mon Mar 18 17:05:02 2024 +0200

    Optimize CountriesCell to add rows only when the cell loads

commit 98d5b77
Author: Povilas Staskus <povilas.staskus@automattic.com>
Date:   Mon Mar 18 16:45:44 2024 +0200

    Optimize TopTotalsCell to add rows only when the cell loads

    TopTotalsCell was calling addRows on every configuration of cell which in turn created and added a hierarchy of UIStackView-based views.

    Optimizing TopTotalsCell to only add rows once and then make manipulations on existing rows.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Tooling Build, Release, and Validation Tools

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants