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 fix, part I: update and cleanup #606

Merged
merged 10 commits into from
Jul 31, 2024
Merged

CI fix, part I: update and cleanup #606

merged 10 commits into from
Jul 31, 2024

Conversation

apostasie
Copy link
Contributor

@apostasie apostasie commented Jul 23, 2024

Work on #604 required a set of changes, fixes and updates to the test rig and CI, and has grown really large.

This PR does split out some of the more minor changes to make it easier to review.

Furthermore, the CI is in a shaky state right now and is just red, as the build fails because of delve latest being dependent on a more recent version of go (which in turns requires a series of changes), and also as #603 seems to break e2e kube tests (or this test is very flaky).

Changes:

  • quiet apk, apt-get, wget and curl to make the logs less noisy and easier to read
  • update github actions to their latest versions
  • update golang to 1.21 - delve requires it - also, go 1.23 is soon to be out - and containerd v2 requires 1.22
  • remove no longer useful variables
  • increase sleep after kill to avoid racy metrics server restart causing port conflict
  • bump and pin ubuntu to 22.04 (and golang from bullseye to bookworm) - fix GLIBC issue

Signed-off-by: apostasie <spam_blackhole@farcloser.world>
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
…ntainer

Signed-off-by: apostasie <spam_blackhole@farcloser.world>
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
@apostasie apostasie force-pushed the dev-ci branch 13 times, most recently from e0992cf to fc7da25 Compare July 24, 2024 16:35
@apostasie apostasie marked this pull request as ready for review July 24, 2024 16:36
@apostasie apostasie changed the title [WIP] CI update and cleanup CI update and cleanup Jul 24, 2024
@apostasie
Copy link
Contributor Author

@imeoer fixing kube tests will take more work, that I would like to do in a separate PR, so, I am removing my "kube" commit from here for now.

This here is just dealing with the rest.

Do you mind having a look at this at your convenience so that we can rebase other ongoing work?
I believe this will fix a bunch of CI issues.

@apostasie
Copy link
Contributor Author

Also, I did split "unrelated" changes into separate commits so that "history" is easier to review, but of course happy to squash if you prefer that.

@apostasie
Copy link
Contributor Author

Note: we might want to pin delve to a specific version to avoid being forced into the same situation wrt golang version later on.

@apostasie apostasie mentioned this pull request Jul 25, 2024
@apostasie apostasie changed the title CI update and cleanup CI fix, part I: update and cleanup Jul 25, 2024
Signed-off-by: apostasie <spam_blackhole@farcloser.world>
@imeoer
Copy link
Collaborator

imeoer commented Jul 31, 2024

LGTM, thanks for the hard work!

@imeoer imeoer merged commit 1fc2063 into containerd:main Jul 31, 2024
15 of 16 checks passed
@apostasie
Copy link
Contributor Author

You welcome @imeoer :)

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