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

Fix Fedora 40 Ci Bugs #4937

Merged
merged 3 commits into from
May 3, 2024
Merged

Fix Fedora 40 Ci Bugs #4937

merged 3 commits into from
May 3, 2024

Conversation

lukewarmtemp
Copy link
Contributor

Fix Fedora 40 CI bugs

@lukewarmtemp lukewarmtemp changed the title Fix fedora 40 ci Fix Fedora 40 Ci Bugs Apr 24, 2024
@jmarrero
Copy link
Member

We probably need to do this again too:
https://github.com/coreos/rpm-ostree/pull/4570/files

I will attempt to continue with this PR changes later today.

@jmarrero
Copy link
Member

jmarrero commented Apr 25, 2024

We are building on:
registry.ci.openshift.org/coreos/fcos-buildroot:testing-devel which currently is f40 we save the rpm-ostree binary on a tar (install.tar)

then run the tests against:
registry.ci.openshift.org/coreos/coreos-assembler:latest which is f39

the `/lib64/libstdc++.so.6: version `CXXABI_1.3.15' not found`

I think this is telling us that the version of libstdc++ from f40 are not backward compatible... trying to replicate locally.

@jlebon
Copy link
Member

jlebon commented Apr 25, 2024

coreos/coreos-assembler#3785 should help

@jlebon
Copy link
Member

jlebon commented Apr 25, 2024

Note we usually also bump the compose commit we test with. At some point those RPMs will be GC'ed.

FEDORA_COREOS_CONFIG_COMMIT=ce65013fcb9f10bfee1c7c1c27477c6c6ce676b3

Copy link
Member

@cgwalters cgwalters left a comment

Choose a reason for hiding this comment

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

Thanks for working on this, it's a fire drill every time...

src/app/rpmostree-clientlib.cxx Outdated Show resolved Hide resolved
@jmarrero
Copy link
Member

jmarrero commented May 2, 2024

something is odd with the f40 container, Colin hit this in ostree too: ostreedev/ostree#3237 (comment)
For us that is the failure we see on: https://github.com/coreos/rpm-ostree/blob/main/rust/src/client.rs#L360C1-L362C6

@cgwalters
Copy link
Member

OK I added a fix for the container one, and also squashed the changes together with a bit more informative commit message hopefully.

(For example previously we were saying "Fix Fedora 40 CI compiler bug" but I don't think it's a compiler bug, just clang changed to be more picky about what it accepts for a legitimate reason)

@cgwalters
Copy link
Member

OK next up is

(rpm-ostree compose tree:131951): libdnf-CRITICAL **: 17:28:49.649: Detection of Platform Module failed: No valid Platform ID detected

OK right...I think we need to turn off modularity.

@cgwalters
Copy link
Member

OK I tried a smaller subset of dropping the modularity stuff but...there's also the dracut failure which looks possibly legitimate.

@cgwalters
Copy link
Member

@lukewarmtemp I'm getting pulled into other things, can I toss this 🏈 back to you to?

ci/test-container.sh Outdated Show resolved Hide resolved
ci/test-container.sh Outdated Show resolved Hide resolved
@lukewarmtemp lukewarmtemp force-pushed the fix-fedora-40-ci branch 2 times, most recently from c799c1b to 66f8fc0 Compare May 3, 2024 15:35
@jmarrero jmarrero dismissed cgwalters’s stale review May 3, 2024 16:45

already fixed on current commit.

@jmarrero
Copy link
Member

jmarrero commented May 3, 2024

down to one...

tests/vmcheck/test-layering-scripts.sh
for combo in ${license_combos}; do
    vm_cmd cat /usr/share/transfiletriggerin-license-${combo}.txt > transfiletriggerin-license-${combo}.txt
    rm -f transfiletriggerin-fs-${combo}.txt.tmp
    (for path in $(echo ${combo} | sed -e 's,-, ,g'); do
         vm_cmd find /usr/share/licenses/${path} -type f
     done) | sort > transfiletriggerin-fs-license-${combo}.txt
    diff -u transfiletriggerin-license-${combo}.txt transfiletriggerin-fs-license-${combo}.txt
done

that find is failing:

[2024-05-03T16:34:22.682Z]    layering-scripts: + ssh -o User=root -o ControlMaster=auto -o ControlPath=/dev/shm/ssh-vmcheck-1714753744750736964.sock -o ControlPersist=yes -F /tmp/test.o4Tcc6/ssh-config vmcheck find /usr/share/licenses/zlib -type f
[2024-05-03T16:34:22.682Z]    layering-scripts: find: ���/usr/share/licenses/zlib���: No such file or directory

I wonder if the file is not there in a new package version or if those non ASCII (maybe) characters might be the issue.

@cgwalters
Copy link
Member

Yeah looks like that code needs to use /usr/share/licenses/zlib-ng instead of /usr/share/licenses/zlib

lukewarmtemp and others added 3 commits May 3, 2024 15:06
- Update hardcoded versions in CI
- Change alloca usage denied by clang
- Workaround dropped `container=oci` env in F40

Signed-off-by: Colin Walters <[email protected]>
This should hopefully fix libdnf warnings.

Signed-off-by: Colin Walters <[email protected]>
@jlebon
Copy link
Member

jlebon commented May 3, 2024

Oddly, zlib-ng doesn't ship a license file. Anyway, I've updated it to use which. That bit of the test passes locally for me on f40.

Copy link
Member

@jmarrero jmarrero left a comment

Choose a reason for hiding this comment

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

lgtm 🙏 🚀

@cgwalters cgwalters enabled auto-merge May 3, 2024 20:55
@cgwalters cgwalters merged commit a10cffa into coreos:main May 3, 2024
17 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.

4 participants