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

🌱 ci: Several CI fixes #1718

Merged
merged 5 commits into from
Oct 10, 2023
Merged

Conversation

mdbooth
Copy link
Contributor

@mdbooth mdbooth commented Oct 10, 2023

This PR contains several critical fixes, all of which are required for passing CI.

Firstly, fixes several issues which seem to stem from a bump in the base prow image.

Secondly, reverts the effect of #1716 by putting the devstack image back to Ubuntu 20.04. Devstack for OpenStack Yoga does not support Ubuntu 22.04.

Lastly, fixes a GCE provisioning issue which prevented #1716 from being tested properly. It looks like we could non-deterministically reuse an old disk image depending on which zone we landed in, meaning we were not necessarily testing the change in the PR under test.

Fixes: #1717

/hold

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 10, 2023
@netlify
Copy link

netlify bot commented Oct 10, 2023

Deploy Preview for kubernetes-sigs-cluster-api-openstack ready!

Name Link
🔨 Latest commit 575dae0
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-sigs-cluster-api-openstack/deploys/65253b3b228d460008a792b9
😎 Deploy Preview https://deploy-preview-1718--kubernetes-sigs-cluster-api-openstack.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mdbooth

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 10, 2023
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 10, 2023
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 10, 2023
tormath1 and others added 4 commits October 10, 2023 10:07
The default is now '--short' and '--short' option has been removed.
Breaking change from this commit: kubernetes/kubernetes@3f07fc3

Signed-off-by: Mathieu Tortuyaux <[email protected]>
As stated in the error message when using 'pip install':
> To install Python packages system-wide, try apt install
> python3-xyz, where xyz is the package you are trying to
> install.

Signed-off-by: Mathieu Tortuyaux <[email protected]>
Also revert bump to Ubuntu 2204 until we bump OpenStack to match.
@mdbooth mdbooth force-pushed the gce-image branch 2 times, most recently from d545fc3 to e5da88f Compare October 10, 2023 10:06
@mdbooth mdbooth changed the title 🌱 ci: Use cloud image directly in server create 🌱 ci: Several CI fixes Oct 10, 2023
Copy link
Contributor

@lentzi90 lentzi90 left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 10, 2023
@mdbooth
Copy link
Contributor Author

mdbooth commented Oct 10, 2023

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 10, 2023
@dulek
Copy link
Contributor

dulek commented Oct 10, 2023

/lgtm

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 10, 2023
Copy link
Contributor

@lentzi90 lentzi90 left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 10, 2023
@k8s-ci-robot k8s-ci-robot merged commit 6796475 into kubernetes-sigs:main Oct 10, 2023
@mdbooth mdbooth deleted the gce-image branch October 10, 2023 13:23
@jichenjc
Copy link
Contributor

jichenjc commented Jan 4, 2024

/cherry-pick release-0.8

@k8s-infra-cherrypick-robot

@jichenjc: #1718 failed to apply on top of branch "release-0.8":

Applying: hack: remove '--short' option
Applying: ci: install python packages using Deb packages
Applying: ci: install libffi8 dependency required for python cffi
Applying: ci: Use cloud image directly in server create
Using index info to reconstruct a base tree...
M	hack/ci/gce-project.sh
Falling back to patching base and 3-way merge...
Auto-merging hack/ci/gce-project.sh
CONFLICT (content): Merge conflict in hack/ci/gce-project.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 ci: Use cloud image directly in server create
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-0.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Old flags used in ensure-kubectl.sh
7 participants