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_stop

Browse source
This commit is contained in:
yalh76 2022-10-24 01:01:02 +02:00
parent 6054f9841f
commit dfbf0b2c7a
3 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/tests_coordination.sh
View file

@ -347,7 +347,7 @@ TEST_LAUNCHER () {
# End the timer for the test # End the timer for the test
stop_timer 2 stop_timer 2
ynh_lxc_stop $LXC_NAME ynh_lxc_stop --name=$LXC_NAME
# Update the lock file with the date of the last finished test. # Update the lock file with the date of the last finished test.
# $$ is the PID of package_check itself. # $$ is the PID of package_check itself.

25
lib/ynh_lxd
View file

@ -4,17 +4,28 @@
# LXD HELPERS # LXD HELPERS
#================================================= #=================================================
# Stopping an LXC container
#
# usage: ynh_lxc_stop --name=name
# | arg: -n, --name= - name of the LXC
#
# Requires YunoHost version *.*.* or higher.
ynh_lxc_stop () { ynh_lxc_stop () {
local container_to_stop=$1 # 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 "$@"
# (We also use timeout 30 in front of the command because sometime lxc # (We also use timeout 30 in front of the command because sometime lxc
# commands can hang forever despite the --timeout >_>...) # commands can hang forever despite the --timeout >_>...)
timeout 30 lxc stop --timeout 15 $container_to_stop 2>/dev/null timeout 30 lxc stop --timeout 15 $name 2>/dev/null
# If the command times out, then add the option --force # If the command times out, then add the option --force
if [ $? -eq 124 ]; then if [ $? -eq 124 ]; then
timeout 30 lxc stop --timeout 15 $container_to_stop --force 2>/dev/null timeout 30 lxc stop --timeout 15 $name --force 2>/dev/null
fi fi
} }
# Run a command inside an LXC container # Run a command inside an LXC container
@ -41,7 +52,7 @@ _ynh_lxc_start_and_wait () {
restart_container() restart_container()
{ {
ynh_lxc_stop $1 ynh_lxc_stop --name=$1
lxc start "$1" lxc start "$1"
} }
@ -129,7 +140,7 @@ ynh_lxc_snapshot_load () {
# Remove swap files before restoring the snapshot. # Remove swap files before restoring the snapshot.
ynh_lxc_swapfiles_clean ynh_lxc_swapfiles_clean
ynh_lxc_stop $LXC_NAME ynh_lxc_stop --name=$LXC_NAME
lxc restore $LXC_NAME $snapname lxc restore $LXC_NAME $snapname
lxc start $LXC_NAME lxc start $LXC_NAME
@ -143,7 +154,7 @@ ynh_lxc_reset () {
ynh_lxc_swapfiles_clean ynh_lxc_swapfiles_clean
fi fi
ynh_lxc_stop $LXC_NAME ynh_lxc_stop --name=$LXC_NAME
if lxc info $LXC_NAME >/dev/null 2>/dev/null; then if lxc info $LXC_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 $LXC_NAME --format json --columns b | jq '.[].expanded_devices.root.pool')

2
lib/ynh_lxd_package_check
View file

@ -257,7 +257,7 @@ ynh_lxc_pc_snapshot_create () {
# Remove swap files to avoid killing the CI with huge snapshots. # Remove swap files to avoid killing the CI with huge snapshots.
ynh_lxc_swapfiles_clean ynh_lxc_swapfiles_clean
ynh_lxc_stop $name ynh_lxc_stop --name=$name
# Check if the snapshot already exist # Check if the snapshot already exist
if ! ynh_lxc_snapshot_exists "$snapname" if ! ynh_lxc_snapshot_exists "$snapname"