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

Automated cherry pick of #5737: Upgrade base image of UBI to UBI9 (#5737) #6104: Do not run tests when building OVS for UBI #6441

Conversation

luolanzone
Copy link
Contributor

@luolanzone luolanzone commented Jun 13, 2024

Cherry pick of #5737 #6104 on release-1.15.

#5737: Upgrade base image of UBI to UBI9 (#5737)
#6104: Do not run tests when building OVS for UBI (#6104)

For details on the cherry pick process, see the cherry pick requests page.

@luolanzone luolanzone added the kind/cherry-pick Categorizes issue or PR as related to the cherry-pick of a bug fix from the main branch to a release label Jun 13, 2024
@tnqn
Copy link
Member

tnqn commented Jun 13, 2024

The job "Build and push latest image if needed / build-ubi" still failed.

@luolanzone
Copy link
Contributor Author

The job "Build and push latest image if needed / build-ubi" still failed.

Yeah, but it's different error now, probably missing some other dependency. I will check with Xu.

@luolanzone luolanzone requested review from xliuxu June 14, 2024 01:57
@xliuxu
Copy link
Contributor

xliuxu commented Jun 14, 2024

The error is produced while running ovs-related tests. Specifically, it is caused by line https://github.com/openvswitch/ovs/blob/2c1a432e2f089f54c4aa395befbc6c2f07f0d305/rhel/openvswitch-fedora.spec.in#L22
seems newer versions of rpmbuild do not treat the line as a comment. Anyway, we do not need to run OVS tests during the building process.

@luolanzone could you help to backport #6104 in this PR as well? I think it can solve the issue.

@luolanzone luolanzone changed the title Automated cherry pick of #5737: Upgrade base image of UBI to UBI9 (#5737) Automated cherry pick of #5737: Upgrade base image of UBI to UBI9 (#5737) #6104: Do not run tests when building OVS for UBI Jun 14, 2024
xliuxu and others added 2 commits June 14, 2024 14:02
- Switch to centos:stream9 to build OVS
- Use bind mount to reduce intermediate layers

Signed-off-by: Xu Liu <xliu2@vmware.com>
This change adds back the default `RPMBUILD_OPT` to disable
unnecessary tests when building OVS rpm packages, which was
previously overwritten in antrea-io#6052.

Signed-off-by: Xu Liu <xu.liu@broadcom.com>
@luolanzone luolanzone force-pushed the automated-cherry-pick-of-#5737-upstream-release-1.15 branch from 09e222f to 240e631 Compare June 14, 2024 06:03
@luolanzone luolanzone requested a review from tnqn June 14, 2024 06:56
Copy link
Member

@tnqn tnqn left a comment

Choose a reason for hiding this comment

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

LGTM

@tnqn
Copy link
Member

tnqn commented Jun 14, 2024

/skip-all

@tnqn tnqn merged commit cb365e2 into antrea-io:release-1.15 Jun 14, 2024
45 of 48 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/cherry-pick Categorizes issue or PR as related to the cherry-pick of a bug fix from the main branch to a release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants