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_snapshot_load

Browse source
This commit is contained in:
yalh76 2022-10-24 01:23:47 +02:00
parent 4f9b714037
commit fc7b071aae
2 changed files with 27 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/tests.sh
View file

@ -129,14 +129,14 @@ _LOAD_SNAPSHOT_OR_INSTALL_APP () {
if ! ynh_lxc_snapshot_exists --name=$LXC_NAME --snapname=$snapname
then
log_warning "Expected to find an existing snapshot $snapname but it doesn't exist yet .. will attempt to create it"
ynh_lxc_snapshot_load snap0 \
ynh_lxc_snapshot_load --name=$LXC_NAME --snapname=snap0 \
&& _PREINSTALL \
&& _INSTALL_APP "path=$check_path" \
&& ynh_lxc_pc_snapshot_create --name=LXC_NAME --snapname=$snapname
else
# Or uses an existing snapshot
log_info "(Reusing existing snapshot $snapname)" \
&& ynh_lxc_snapshot_load $snapname
&& ynh_lxc_snapshot_load --name=$LXC_NAME --snapname=$snapname
fi
}
@ -356,7 +356,7 @@ TEST_INSTALL () {
[ "$install_type" = "private" ] && { start_test "Installation in private mode"; local is_public="0"; }
local snapname=snap_${install_type}install
ynh_lxc_snapshot_load snap0
ynh_lxc_snapshot_load --name=$LXC_NAME --snapname=snap0
_PREINSTALL
@ -392,7 +392,7 @@ _TEST_MULTI_INSTANCE () {
local check_path="$(default_install_path)"
ynh_lxc_snapshot_load snap0
ynh_lxc_snapshot_load --name=$LXC_NAME --snapname=snap0
log_small_title "First installation: path=$SUBDOMAIN$check_path" \
&& _LOAD_SNAPSHOT_OR_INSTALL_APP "$check_path" \
@ -436,7 +436,7 @@ TEST_UPGRADE () {
cp -a "$package_path" "${package_path}_back"
(cd "$package_path"; git checkout --force --quiet "$commit")
ynh_lxc_snapshot_load snap0
ynh_lxc_snapshot_load --name=$LXC_NAME --snapname=snap0
_PREINSTALL
@ -481,7 +481,7 @@ TEST_PORT_ALREADY_USED () {
local check_port="$1"
local check_path="$(default_install_path)"
ynh_lxc_snapshot_load snap0
ynh_lxc_snapshot_load --name=$LXC_NAME --snapname=snap0
# Build a service with netcat for use this port before the app.
echo -e "[Service]\nExecStart=/bin/netcat -l -k -p $check_port\n
@ -570,7 +570,7 @@ TEST_BACKUP_RESTORE () {
elif [ $j -eq 1 ]
then
ynh_lxc_snapshot_load snap0
ynh_lxc_snapshot_load --name=$LXC_NAME --snapname=snap0
# Remove the previous residual backups
ynh_lxc_run_inside --name=$LXC_NAME --command="rm -rf /home/yunohost.backup/archives"

26
lib/ynh_lxd
View file

@ -180,18 +180,32 @@ ynh_lxc_snapshot_exists () {
lxc list --format json | jq -e --arg name $name --arg snapname $snapname '.[] | select(.name==$name) | .snapshots[] | select(.name==$snapname)' >/dev/null
}
# Load a snapshot of an LXC container
#
# usage: ynh_lxc_snapshot_load --name=name --snapname=snapname
# | arg: -n, --name= - name of the LXC
# | arg: -s, --snapname= - name of the snapshot
#
# Requires YunoHost version *.*.* or higher.
ynh_lxc_snapshot_load () {
local snapname=$1
# Declare an array to define the options of this helper.
local legacy_args=ns
local -A args_array=([n]=name= [s]=snapname=)
local name
local snapname
# Manage arguments with getopts
ynh_handle_getopts_args "$@"
log_debug "Loading snapshot $snapname ..."
# Remove swap files before restoring the snapshot.
ynh_lxc_swapfiles_clean --name=$LXC_NAME
ynh_lxc_swapfiles_clean --name=$name
ynh_lxc_stop --name=$LXC_NAME
ynh_lxc_stop --name=$name
lxc restore $LXC_NAME $snapname
lxc start $LXC_NAME
_ynh_lxc_start_and_wait --name=$LXC_NAME
lxc restore $name $snapname
lxc start $name
_ynh_lxc_start_and_wait --name=$name
}
ynh_lxc_reset () {