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 #3729

Merged
merged 4 commits into from
Feb 8, 2023
Merged

[1.1] Fix CI #3729

merged 4 commits into from
Feb 8, 2023

Conversation

kolyshkin
Copy link
Contributor

@kolyshkin kolyshkin commented Feb 7, 2023

CI fixes for release-1.1 branch.

  1. Seems that the F35 vagrant image was removed, so we need to switch to a supported Fedora version (37). This is roughly the same as backporting Vagrantfile.fedora: upgrade Fedora to 36 #3442 and Vagrantfile.fedora: upgrade Fedora to 37 #3670.

  2. Backports of tests/integration/get-images.sh: fix busybox.tar.xz URL #3700, Explicitly pin busybox and debian downloads #3701 and tests: replace local hello world bundle with busybox bundle #3526 (stolen from [1.1] Fix CI #3723).

Closes: #3723.

@kolyshkin kolyshkin added this to the 1.1.5 milestone Feb 7, 2023
@kolyshkin
Copy link
Contributor Author

kolyshkin commented Feb 7, 2023

ci / test failures are being addressed by #3723

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.

ci / test failures are being addressed by #3723

Do we need to combine both PRs to get green CI?

Vagrantfile.fedora Outdated Show resolved Hide resolved
kolyshkin and others added 4 commits February 7, 2023 16:03
Apparently, the Fedora 35 is not supported now, and the image is removed
from servers, so vagrant can no longer find it.

Bump to Fedora 37 to fix CI.

Signed-off-by: Kir Kolyshkin <[email protected]>
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 <[email protected]>
(cherry picked from commit 66bf371)
Signed-off-by: Tianon Gravi <[email protected]>
(cherry picked from commit 6d28928)
@kolyshkin kolyshkin changed the title [1.1] Fix vagrant:fedora CI job [1.1] Fix CI Feb 8, 2023
@kolyshkin
Copy link
Contributor Author

Do we need to combine both PRs to get green CI?

Yes, just did that here.

@kolyshkin kolyshkin mentioned this pull request Feb 8, 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, thanks!

@thaJeztah
Copy link
Member

@AkihiroSuda ptal

@AkihiroSuda AkihiroSuda merged commit bec9736 into opencontainers:release-1.1 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.

5 participants