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

[1.1] Fix CI #3723

Closed
wants to merge 3 commits into from
Closed

Conversation

rata
Copy link
Member

@rata rata commented Feb 6, 2023

When I opened PR #3721 the CI fails due to downloading the busybox image. This PR should fix that.

I'm backporting #3700 #3701 and #3526 for this. The fist two are fixes for this (and is simpler to backport both than to bakport one and fix the conflicts). The last one (#3526) I've backported it too, so I can apply the first two without conflicts. It only changes tests, so it seems safe to backport.

I think backporting all of these makes it simpler also to backport any more change needed in the future (as these files are in sync between 1.1 branch and main), and as they only change the tests it seems fine IMHO. Let me know if you prefer more chirurgical changes and to deal with conflicts when backporting.

zhsj and others added 2 commits February 6, 2023 15:18
Currently only amd64 and arm64v8 tarball have been checked in testdata,
while busybox bundle is downloaded on fly, and supports multiple architectures.

To enable integration tests for more architectures, the hello world
bundle is replaced by busybox one.

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
(cherry picked from commit 66bf371)
Fix issue 3699

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
thaJeztah
thaJeztah previously approved these changes Feb 6, 2023
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

(assuming the CI failure is related; looks like a hiccup, so needs to be triggered again later)

@rata
Copy link
Member Author

rata commented Feb 6, 2023

I'm not sure if the vagrant failure is valid (but not caused by this). Seems weird it doesn't happen on main, though. Will repush

Signed-off-by: Tianon Gravi <admwiggin@gmail.com>
(cherry picked from commit 6d28928)
@rata
Copy link
Member Author

rata commented Feb 6, 2023

@kolyshkin @thaJeztah Do you want to carry forward this PR and fix vagrant (vagrant failure seems legit, the other fails seems like azure downtime or some more fixes needed :-/)

@kolyshkin
Copy link
Contributor

Re: vagrant, it seems that the F35 image was removed, we need to switch to a newer version. This means backporting #3442 and maybe #3670.

@kolyshkin kolyshkin added this to the 1.1.5 milestone Feb 7, 2023
@kolyshkin kolyshkin mentioned this pull request Feb 7, 2023
@kolyshkin
Copy link
Contributor

I have added the commits from here to #3729, so closing this one. Thanks @rata!

@kolyshkin kolyshkin closed this Feb 8, 2023
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

6 participants