YunoHost/package_check
1
0
Fork 0
mirror of https://github.com/YunoHost/package_check.git synced 2024-09-03 20:06:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Implement ynh_lxc_reset

Browse source
This commit is contained in:
yalh76 2022-10-24 01:26:47 +02:00
parent fc7b071aae
commit 587b240dcc
3 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/tests_coordination.sh
View file

@ -254,7 +254,7 @@ run_all_tests() {
# Reset and create a fresh container to work with # Reset and create a fresh container to work with
check_lxd_setup check_lxd_setup
ynh_lxc_reset ynh_lxc_reset --name=$LXC_NAME
ynh_lxc_pc_create --image=$LXC_BASE --name=$LXC_NAME ynh_lxc_pc_create --image=$LXC_BASE --name=$LXC_NAME
# Be sure that the container is running # Be sure that the container is running
ynh_lxc_pc_exec --name=$LXC_NAME --command="true" ynh_lxc_pc_exec --name=$LXC_NAME --command="true"

28
lib/ynh_lxd
View file

@ -208,20 +208,32 @@ ynh_lxc_snapshot_load () {
_ynh_lxc_start_and_wait --name=$name _ynh_lxc_start_and_wait --name=$name
} }
# Reset an LXC container
#
# usage: ynh_lxc_reset --name=name
# | arg: -n, --name= - name of the LXC
#
# Requires YunoHost version *.*.* or higher.
ynh_lxc_reset () { ynh_lxc_reset () {
# Declare an array to define the options of this helper.
local legacy_args=n
local -A args_array=([n]=name=)
local name
# Manage arguments with getopts
ynh_handle_getopts_args "$@"
# If the container exists # If the container exists
if lxc info $LXC_NAME >/dev/null 2>/dev/null; then if lxc info $name >/dev/null 2>/dev/null; then
# Remove swap files before deletting the continer # Remove swap files before deletting the continer
ynh_lxc_swapfiles_clean --name=$LXC_NAME ynh_lxc_swapfiles_clean --name=$name
fi fi
ynh_lxc_stop --name=$LXC_NAME ynh_lxc_stop --name=$name
if lxc info $LXC_NAME >/dev/null 2>/dev/null; then if lxc info $name >/dev/null 2>/dev/null; then
local current_storage=$(lxc list $LXC_NAME --format json --columns b | jq '.[].expanded_devices.root.pool') local current_storage=$(lxc list $name --format json --columns b | jq '.[].expanded_devices.root.pool')
swapoff "$(lxc storage get $current_storage source)/containers/$LXC_NAME/rootfs/swap" 2>/dev/null swapoff "$(lxc storage get $current_storage source)/containers/$name/rootfs/swap" 2>/dev/null
fi fi
lxc delete $LXC_NAME --force 2>/dev/null lxc delete $name --force 2>/dev/null
} }

2
package_check.sh
View file

@ -124,7 +124,7 @@ parse_args
function cleanup() function cleanup()
{ {
trap '' SIGINT # Disable ctrl+c in this function trap '' SIGINT # Disable ctrl+c in this function
ynh_lxc_reset ynh_lxc_reset --name=$LXC_NAME
[ -n "$TEST_CONTEXT" ] && rm -rf "$TEST_CONTEXT" [ -n "$TEST_CONTEXT" ] && rm -rf "$TEST_CONTEXT"
[ -n "$lock_file" ] && rm -f "$lock_file" [ -n "$lock_file" ] && rm -f "$lock_file"