opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-20 08:36:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17954 from edsantiago/sqlite_containersconf

Browse Source 
CI: enable sqlite system tests
This commit is contained in:
OpenShift Merge Robot
2023-04-12 12:02:38 -04:00
committed by GitHub
parent 2784a693a3 f95276bfaf
commit 52948641d0
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/cirrus/setup_environment.sh
View File

@ -75,6 +75,8 @@ fi
cd "${GOSRC}/" cd "${GOSRC}/"
mkdir -p /etc/containers/containers.conf.d
# Defined by lib.sh: Does the host support cgroups v1 or v2? Use runc or crun # Defined by lib.sh: Does the host support cgroups v1 or v2? Use runc or crun
# respectively. # respectively.
# **IMPORTANT**: $OCI_RUNTIME is a fakeout! It is used only in e2e tests. # **IMPORTANT**: $OCI_RUNTIME is a fakeout! It is used only in e2e tests.
@ -84,7 +86,7 @@ case "$CG_FS_TYPE" in
if ((CONTAINER==0)); then if ((CONTAINER==0)); then
warn "Forcing testing with runc instead of crun" warn "Forcing testing with runc instead of crun"
echo "OCI_RUNTIME=runc" >> /etc/ci_environment echo "OCI_RUNTIME=runc" >> /etc/ci_environment
printf "[engine]\nruntime=\"runc\"\n" >>/etc/containers/containers.conf printf "[engine]\nruntime=\"runc\"\n" > /etc/containers/containers.conf.d/90-runtime.conf
fi fi
;; ;;
cgroup2fs) cgroup2fs)
@ -93,6 +95,10 @@ case "$CG_FS_TYPE" in
*) die_unknown CG_FS_TYPE *) die_unknown CG_FS_TYPE
esac esac
# Force the requested database backend without having to use command-line args
# shellcheck disable=SC2154
printf "[engine]\ndatabase_backend=\"$CI_DESIRED_DATABASE\"\n" > /etc/containers/containers.conf.d/92-db.conf
if ((CONTAINER==0)); then # Not yet running inside a container if ((CONTAINER==0)); then # Not yet running inside a container
# Discovered reemergence of BFQ scheduler bug in kernel 5.8.12-200 # Discovered reemergence of BFQ scheduler bug in kernel 5.8.12-200
# which causes a kernel panic when system is under heavy I/O load. # which causes a kernel panic when system is under heavy I/O load.

1
test/system/005-info.bats
View File

@ -94,7 +94,6 @@ host.slirp4netns.executable | $expr_path
} }
@test "podman info - confirm desired database" { @test "podman info - confirm desired database" {
skip "FIXME: no way yet (2023-03-16) to override DB in system tests"
if [[ -z "$CI_DESIRED_DATABASE" ]]; then if [[ -z "$CI_DESIRED_DATABASE" ]]; then
# When running in Cirrus, CI_DESIRED_DATABASE *must* be defined # When running in Cirrus, CI_DESIRED_DATABASE *must* be defined
# in .cirrus.yml so we can double-check that all CI VMs are # in .cirrus.yml so we can double-check that all CI VMs are