Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

transition bionic containers to jammy #1057

Merged
merged 2 commits into from
Aug 7, 2023
Merged

Conversation

trws
Copy link
Member

@trws trws commented Aug 4, 2023

This may end up having to merge before the tests on flux-core's version can pass, because of the flux-sched test run. Hoping to get a jump on it here, somehow need to break the cycle.

@trws trws force-pushed the jammy branch 10 times, most recently from ea0b610 to de52f4c Compare August 7, 2023 22:00
@trws trws requested a review from grondo August 7, 2023 22:08
Copy link
Contributor

@grondo grondo left a comment

Choose a reason for hiding this comment

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

LGTM, but honestly I'd consider just squashing all these commits into one big commit with a nice descriptive commit message saying something like ci: replace bionic with jammy and bookworm with a nice explanation in the message "bionic is out of LTS, etc" so update to jammy and add a bookworm image since flux-core has one, etc.

If you want to keep a couple separate commits that's fine too, but they'd need commit message to give slightly more detail.

And THANK YOU for doing this!

@trws
Copy link
Member Author

trws commented Aug 7, 2023

Thanks @grondo. Most of these are squashed out, all the container oriented commits are. There's a larger commit message, and updated to only build one jammy output along with using bookworm for most tests.

This is an image update/rework for our CI.  Since bionic has fallen out
of LTS standard support, the original plan was to update to Jammy and
move on.  There's more here than that because Jammy doesn't provide a
386 container build anymore.  To fill in that gap, we also have a Debian
bookworm container, which is now the default target.  There is also a
Jammy build in here to keep an ubuntu LTS current container going, but
the Ubuntu side is painful enough that most of the tests are now on
bookworm.

Additionally:
* el7 is dropped
* fedora outside of 34 (forked to el9) and current are dropped
* docker-checks-run script updated from matching PR in core
Copy link
Contributor

@grondo grondo left a comment

Choose a reason for hiding this comment

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

LGTM! Thanks @trws

@trws trws added the merge-when-passing mergify.io - merge PR automatically once CI passes label Aug 7, 2023
@codecov
Copy link

codecov bot commented Aug 7, 2023

Codecov Report

Merging #1057 (205c137) into master (9726908) will decrease coverage by 1.9%.
The diff coverage is n/a.

❗ Current head 205c137 differs from pull request most recent head ac8b26c. Consider uploading reports for the commit ac8b26c to get more accurate results

@@           Coverage Diff            @@
##           master   #1057     +/-   ##
========================================
- Coverage    74.4%   72.6%   -1.9%     
========================================
  Files          86      80      -6     
  Lines        9434   10243    +809     
========================================
+ Hits         7020    7437    +417     
- Misses       2414    2806    +392     

see 68 files with indirect coverage changes

@grondo grondo merged commit a34dbe6 into flux-framework:master Aug 7, 2023
15 checks passed
trws pushed a commit to trws/flux-sched that referenced this pull request Aug 22, 2023
transition bionic containers to jammy
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge-when-passing mergify.io - merge PR automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants