Skip to content

ci: re-add firewalld jobs#48756

Merged
thaJeztah merged 1 commit intomoby:masterfrom
akerouanton:reduce-number-of-firewalld-jobs
Nov 12, 2024
Merged

ci: re-add firewalld jobs#48756
thaJeztah merged 1 commit intomoby:masterfrom
akerouanton:reduce-number-of-firewalld-jobs

Conversation

@akerouanton
Copy link
Copy Markdown
Member

@akerouanton akerouanton commented Oct 25, 2024

- What I did

Follow-up for:

Commit 4e567e1 added firewalld to the test matrix for various CI jobs (namely unit, integration and integration-cli).

Commit 2807c0c reverted that commit as it was putting too much load on GHA cache, and thus it was returning 429 more frequently, so builds had a greater chance of spending time building everything from scratch. This was slowing down our CI even more than what it was before.

This new commit re-adds firewalld to the test matrix of unit, integration and integration-cli jobs. Unlike 4e567e1, not all combinations of OS, storage and 'mode' will be tested. Instead, firewalld jobs will run only on ubuntu-22.04, and with the containerd snapshotter.

Also, the revert commit mistakenly reverted a fix that was originally intended for commit 8883db2, but was actually 'fixed up' in the wrong commit. Let's re-revert that too.

- How I did it

- How to verify it

@akerouanton akerouanton force-pushed the reduce-number-of-firewalld-jobs branch 17 times, most recently from 1b4d2a3 to ecaa2b8 Compare October 28, 2024 15:47
@akerouanton akerouanton force-pushed the reduce-number-of-firewalld-jobs branch 7 times, most recently from 319ba70 to eecc290 Compare October 31, 2024 16:51
Commit 4e567e1 added firewalld to the test matrix for various CI jobs
(namely unit, integration and integration-cli).

Commit 2807c0c reverted that commit as it was putting too much load on
GHA cache, and thus it was returning 429 more frequently, so builds had
a greater chance of spending time building everything from scratch. This
was slowing down our CI even more than what it was before.

This new commit re-adds firewalld to the test matrix of unit,
integration and integration-cli jobs. Unlike 4e567e1, not all
combinations of OS, storage and 'mode' will be tested. Instead,
firewalld jobs will run only on ubuntu-22.04, and with the containerd
snapshotter.

Also, the revert commit mistakenly reverted a fix that was originally
intended for commit 8883db2, but was actually 'fixed up' in the wrong
commit. Let's re-revert that too.

Signed-off-by: Albin Kerouanton <[email protected]>
@akerouanton akerouanton force-pushed the reduce-number-of-firewalld-jobs branch from eecc290 to 816dbbf Compare October 31, 2024 17:01
// Moreover, since the goal is to run only relevant tests with
// firewalld enabled to minimize the number of CI jobs, we
// statically define the list of test suites that we want to run.
if ("${{ inputs.storage }}" == "snapshotter") {
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

integration-cli test suites are deprecated, and the test/validate GHA job executes hack/validate/deprecate-integration-cli which should error out if any new test is added to the integration-cli test suites. So I assume it's perfectly fine to define these suites statically.

@akerouanton akerouanton marked this pull request as ready for review October 31, 2024 17:03
@akerouanton akerouanton requested a review from tianon as a code owner October 31, 2024 17:03
Copy link
Copy Markdown
Member

@crazy-max crazy-max left a comment

Choose a reason for hiding this comment

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

Nice LGTM!

@akerouanton akerouanton changed the title ci: reduce number of firewalld jobs ci: re-add firewalld jobs Nov 8, 2024
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah thaJeztah merged commit ae21b3c into moby:master Nov 12, 2024
@akerouanton akerouanton deleted the reduce-number-of-firewalld-jobs branch November 13, 2024 11:02
@robmry robmry mentioned this pull request Mar 19, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants