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

A lot of CI fixes for F39 #4692

Merged
merged 10 commits into from
Nov 21, 2023
Merged

A lot of CI fixes for F39 #4692

merged 10 commits into from
Nov 21, 2023

Conversation

cgwalters
Copy link
Member

@cgwalters cgwalters commented Nov 17, 2023

daemon: Make one bit of C++ code compatible with f38+f39 clang-format

The style for this one corner case changed going to f39; rework
the code to make it format the same with both. The new code is also
clearer I think.


ci/test-container: Drop modularity tests in F39

It's dead, jim.


ci/test-container: Update for f39


Remove layering-modules test

We're no longer targeting a Fedora version that has modules.


tests: Add f39 compatibility

The regular 6 month treadmill.


tests/container-build-integration: Use testing-devel

Otherwise our CI will just be broken in cases like right
now when testing-devel = F39 and stable = F38


tests: Remove layering-fedorainfra

This duplicates things we have elsewhere and has hardcoded
package versions that are tedious to maintain.


tests: Remove vmcheck/test-db

This one is also caught out by the "can't easily build for i686 anymore"
issue.

In practice we haven't broken anything in this space in a long time,
and fixing the test to just drop out the i686 bits would be a bit
tedious.


tests/layering-rpmdb: Drop i686 builds

I'm sure this is possible still, but it doesn't work
by default anymore. I don't know what sorcery it requires.

In practice, we're unlikely to break this code soon.


The style for this one corner case changed going to f39; rework
the code to make it format the same with both.  The new code is also
clearer I think.
ci/test-container.sh Dismissed Show dismissed Hide dismissed
jlebon
jlebon previously approved these changes Nov 17, 2023
tests/vmcheck/test-override-replace-2.sh Dismissed Show dismissed Hide dismissed
tests/vmcheck/test-override-replace-2.sh Dismissed Show dismissed Hide dismissed
We're no longer targeting a Fedora version that has modules.
@cgwalters cgwalters changed the title daemon: Make one bit of C++ code compatible with f38+f39 clang-format A lot of CI fixes for F39 Nov 19, 2023
The regular 6 month treadmill.
Otherwise our CI will just be broken in cases like right
now when testing-devel = F39 and stable = F38
tests/vmcheck/test-override-kernel.sh Dismissed Show dismissed Hide dismissed
@cgwalters
Copy link
Member Author

Holy cow. The technical debt each Fedora major version update turns up in our CI is staggering.

@cgwalters
Copy link
Member Author

OK I think the last two bugs here are the journal regression we hit in ostreedev/ostree@c668a8c

I'm not totally sure about the cost/benefit of trying to work around versus trying to get a fixed systemd. The latter is probably sanest.

Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

Not comfortable with some of the coverage dropping we do here. Let me see if I can fix things up.

tests/kolainst/destructive/layering-fedorainfra Outdated Show resolved Hide resolved
tests/vmcheck/test-layering-rpmdb.sh Outdated Show resolved Hide resolved
@jlebon
Copy link
Member

jlebon commented Nov 20, 2023

Added a bunch of commits!

OK I think the last two bugs here are the journal regression we hit in ostreedev/ostree@c668a8c

I'm not totally sure about the cost/benefit of trying to work around versus trying to get a fixed systemd. The latter is probably sanest.

Ouch. Yeah, agreed. I commented in systemd/systemd#29275 (comment). Once they get a fix out, we could fast-track it into testing-devel to unblock this PR.

@jlebon
Copy link
Member

jlebon commented Nov 20, 2023

Alternatively, I guess we can skip those tests for now?

@cgwalters
Copy link
Member Author

Alternatively, I guess we can skip those tests for now?

Yeah done

Seems like we're semi-regularly timing out. Let's bump it a bit more.
@jlebon jlebon enabled auto-merge November 21, 2023 16:31
@jlebon jlebon merged commit 457fc5f into coreos:main Nov 21, 2023
12 of 13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants