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

bump bats-core, fix some tests, use new features #3815

Merged
merged 3 commits into from
Apr 8, 2023

Conversation

kolyshkin
Copy link
Contributor

@kolyshkin kolyshkin commented Apr 5, 2023

  • bump bats-core to a version used in Fedora 37, so we have the same version everywhere
  • fix some checks in integration tests
  • add minimal support for cgroups v1 "misc" controller (bug found by the above fix)

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 <[email protected]>
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 <[email protected]>
This is just so that the container can join the misc controller.

Signed-off-by: Kir Kolyshkin <[email protected]>
@kolyshkin kolyshkin marked this pull request as ready for review April 6, 2023 18:41
@kolyshkin kolyshkin changed the title [WIP] bump bats-core, fix some tests, use new features bump bats-core, fix some tests, use new features Apr 6, 2023
@kolyshkin kolyshkin added this to the 1.2.0 milestone Apr 6, 2023
@mrunalp mrunalp merged commit d8a3daa into opencontainers:main Apr 8, 2023
@kolyshkin kolyshkin added the backport/1.1-todo A PR in main branch which needs to be backported to release-1.1 label May 22, 2023
@kolyshkin
Copy link
Contributor Author

Backported to 1.1 in #3823 and #3878.

@kolyshkin kolyshkin added backport/1.1-done A PR in main branch which has been backported to release-1.1 and removed backport/1.1-todo A PR in main branch which needs to be backported to release-1.1 labels May 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/cgroupv1 area/ci backport/1.1-done A PR in main branch which has been backported to release-1.1 impact/changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants