[1.1] bump Fedora, Vagrant, bats #3878
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced May 22, 2023
|
Need to backport #3880 as well |
|
Draft until I add a backport of #3880. |
This version is already used by Cirrus CI Fedora 37 job, but other CI jobs are still using 1.3.0. Bump it everywhere so we can enjoy new version features and fixes. For one thing, I noticed that new bats is reporting error location correctly. We will also be able to use "run !" and "run -N" commands. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 9dbb9f9) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Apparently, bash with set -e deliberately ignores non-zero return codes from ! cmd, unless this is the last command. The workaround is to either use "! cmd || false', "or run ! cmd". Choose the latter, and require bash-core 1.5.0 (since this is when "run !" was added), replacing the older check. Alas I only learned this recently from the bash-core documentation. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 9b71787) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
A version of vagrant available from the stock repos (2.2.19) is too old and contains a bug that prevents downloading Fedora 38 image (see [1]). Use packages from hashicorp repo, which currently has vagrant 2.3.4. This resolves the problem of downloading the latest Fedora image. Also, vagrant-libvirt plugin from Ubuntu repos is not working with vagrant from hashicorp, so switch to using "vagrant plugin install". The downside it, this takes extra 4 minutes or so in our CI, and I am not sure how to cache it or speed it up. [1] opencontainers#3835 (comment) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 33b6ec2) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit a192000) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
As Fedora 38 uses bats 1.9.0, let's switch to this version in other places. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 13091ee) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
As of today, vagrant stopped working, my best guess is due to bad caching. Here's an excerpt from logs: ... vagrant plugin install vagrant-libvirt Installing the 'vagrant-libvirt' plugin. This can take a few minutes... Building native extensions. This could take a while... Installed the plugin 'vagrant-libvirt (0.12.1)'! ... uname -s ; cat Vagrantfile.$DISTRO Linux ... Downloaded 481Mb in 4.096201s. Cache hit for vagrant-8be35383dc00f23d080ff00b2a724c938d650254861f26b67624c28e3fe5e6ae! ... Vagrant failed to initialize at a very early stage: The plugins failed to initialize correctly. This may be due to manual modifications made within the Vagrant home directory. ... Error message given during initialization: Unable to resolve dependency: user requested 'vagrant-libvirt (= 0.12.0)' ... The problem is, vagrant cache overwrites newer plugin with an older one. Let's only cache the downloaded image. Also, change the cache fingerprint script (remove "Linux"). Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 650efb2) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
... so we can run all four jobs in parallel. While at it, fix the comment in the file. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit bb4dbbc) Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
kolyshkin
force-pushed
the
1.1-bump-vagrant
branch
from
5ce59f7
to
7fa912e
Compare
|
OK @opencontainers/runc-maintainers this one is ready |
AkihiroSuda
approved these changes
Jun 7, 2023
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a backport of #3848, #3815 (modulo #3823) and #3880 to release-1.1 branch.
Purely CI changes here (F37->F38, newer Vagrant, newer bats, some test/int CI fixes).