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

Alpine 317 #3888

Merged
merged 12 commits into from Jan 5, 2023
Merged

Alpine 317 #3888

merged 12 commits into from Jan 5, 2023

Conversation

deitch
Copy link
Collaborator

@deitch deitch commented Dec 29, 2022

- What I did

Bumped linuxkit/alpine from basing on alpine:3.14 to alpine:3.17. Too many packages were too far out of date, especially go.

Note that I did not rebuild for s390x, as we do not have a build server for it.

- How I did it

Followed the doc. Slowly.

- How to verify it

CI

- Description for the changelog

alpine:3.17 base

@deitch
Copy link
Collaborator Author

deitch commented Dec 29, 2022

fixes #3885

@deitch
Copy link
Collaborator Author

deitch commented Dec 29, 2022

Additionally had to do the following:

  • update go-compile.sh to work, as well as reformat a few go files for the go1.19 rules.
  • update some packages

tools/alpine/versions.aarch64 Outdated Show resolved Hide resolved
@deitch deitch force-pushed the alpine-317 branch 3 times, most recently from 4a9690d to 7b516aa Compare December 29, 2022 15:13
@deitch
Copy link
Collaborator Author

deitch commented Dec 30, 2022

The kmsg test is failing, apparently nothing is being written to /var/log by memlogd. Since it takes all of the logs, I do not know how to debug it.

It looks like examples/logging.yml fails as well; nothing ends up in /var/log That should make it a bit easier to debug, as it has getty configured, so you can log in and see things, but there is nothing to see. I don't know if this is something broken by the changes here, or something from earlier that did not get picked up until now.

@deitch
Copy link
Collaborator Author

deitch commented Dec 30, 2022

Once #3890 is in, I can rebase and it should fix it.

@deitch
Copy link
Collaborator Author

deitch commented Jan 3, 2023

#3890 is in, that should fix the failing tests around logwrite and kmsg.

I also had to fix ci.yml and test/pkg/Makefile, which I originally did as a commit on this PR, but it could be broken out separately, so I broke it into #3892. Once that one is in, this should be a clean "update to alpine 3.17" PR and should pass.

Signed-off-by: Avi Deitcher <avi@deitcher.net>
Signed-off-by: Avi Deitcher <avi@deitcher.net>
@deitch
Copy link
Collaborator Author

deitch commented Jan 4, 2023

OK #3890 and #3892 are in. Rebased and pushed, hopefully it all will be clean now.

Signed-off-by: Avi Deitcher <avi@deitcher.net>
Signed-off-by: Avi Deitcher <avi@deitcher.net>
Signed-off-by: Avi Deitcher <avi@deitcher.net>
Signed-off-by: Avi Deitcher <avi@deitcher.net>
Signed-off-by: Avi Deitcher <avi@deitcher.net>
Signed-off-by: Avi Deitcher <avi@deitcher.net>
Signed-off-by: Avi Deitcher <avi@deitcher.net>
Signed-off-by: Avi Deitcher <avi@deitcher.net>
Signed-off-by: Avi Deitcher <avi@deitcher.net>
Signed-off-by: Avi Deitcher <avi@deitcher.net>
@deitch
Copy link
Collaborator Author

deitch commented Jan 4, 2023

Yes! And now CI is clean!

@deitch deitch requested a review from rn January 4, 2023 17:57
Copy link
Member

@rn rn left a comment

Choose a reason for hiding this comment

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

wow, great effort @deitch. LGTM

@deitch deitch merged commit e668b25 into linuxkit:master Jan 5, 2023
@deitch deitch deleted the alpine-317 branch January 5, 2023 05:27
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.

None yet

2 participants