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

Merge pull request #104 from YunoHost/fix-lxc-exec

Browse source 
Fix lxc exec
This commit is contained in:
Alexandre Aubin 2021-03-23 00:39:18 +01:00 • committed by GitHub
commit 8b6190a6ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/lxc.sh
View file

@ -91,7 +91,7 @@ LXC_EXEC () {
start_timer start_timer
# Execute the command given in argument in the container and log its results. # Execute the command given in argument in the container and log its results.
lxc exec $LXC_NAME --env PACKAGE_CHECK_EXEC=1 -t -- $cmd | tee -a "$complete_log" $current_test_log lxc exec $LXC_NAME --env PACKAGE_CHECK_EXEC=1 -t -- /bin/bash -c "$cmd" | tee -a "$complete_log" $current_test_log
# Store the return code of the command # Store the return code of the command
local returncode=${PIPESTATUS[0]} local returncode=${PIPESTATUS[0]}

8
lib/tests.sh
View file

@ -80,8 +80,8 @@ _INSTALL_APP () {
done done
# Install the application in a LXC container # Install the application in a LXC container
log_info "Running: yunohost app install --force /app_folder -a $install_args" log_info "Running: yunohost app install --force /app_folder -a \"$install_args\""
_RUN_YUNOHOST_CMD "app install --force /app_folder -a $install_args" _RUN_YUNOHOST_CMD "app install --force /app_folder -a \"$install_args\""
local ret=$? local ret=$?
[ $ret -eq 0 ] && log_debug "Installation successful." || log_error "Installation failed." [ $ret -eq 0 ] && log_debug "Installation successful." || log_error "Installation failed."
@ -886,12 +886,12 @@ ACTIONS_CONFIG_PANEL () {
then then
# Build the argument from a value from the check_process # Build the argument from a value from the check_process
local action_config_actual_argument="$(echo "$actions_config_arguments_specifics" | cut -d'|' -f $j)" local action_config_actual_argument="$(echo "$actions_config_arguments_specifics" | cut -d'|' -f $j)"
action_config_argument_built="--args $action_config_argument_name=$action_config_actual_argument" action_config_argument_built="--args \"$action_config_argument_name=$action_config_actual_argument\""
elif [ -n "$action_config_argument_default" ] elif [ -n "$action_config_argument_default" ]
then then
# Build the argument from the default value # Build the argument from the default value
local action_config_actual_argument="$action_config_argument_default" local action_config_actual_argument="$action_config_argument_default"
action_config_argument_built="--args $action_config_argument_name=$action_config_actual_argument" action_config_argument_built="--args \"$action_config_argument_name=$action_config_actual_argument\""
else else
log_warning "> No argument into the check_process to use or default argument for \"$action_config_name\"..." log_warning "> No argument into the check_process to use or default argument for \"$action_config_name\"..."
action_config_actual_argument="" action_config_actual_argument=""

10
lib/tests_coordination.sh
View file

@ -108,10 +108,14 @@ parse_check_process() {
# Upgrades with a specific commit # Upgrades with a specific commit
if [[ "$test_type" == "TEST_UPGRADE" ]] && [[ -n "$test_arg" ]] if [[ "$test_type" == "TEST_UPGRADE" ]] && [[ -n "$test_arg" ]]
then then
local specific_upgrade_install_args="$(grep "^manifest_arg=" "$TEST_CONTEXT/upgrades/$test_arg" | cut -d'=' -f2-)" if [ -f "$TEST_CONTEXT/upgrades/$test_arg" ]; then
[[ -n "$specific_upgrade_install_args" ]] && _install_args="$specific_upgrade_install_args" local specific_upgrade_install_args="$(grep "^manifest_arg=" "$TEST_CONTEXT/upgrades/$test_arg" | cut -d'=' -f2-)"
[[ -n "$specific_upgrade_install_args" ]] && _install_args="$specific_upgrade_install_args"
local upgrade_name="$(grep "^name=" "$TEST_CONTEXT/upgrades/$test_arg" | cut -d'=' -f2)" local upgrade_name="$(grep "^name=" "$TEST_CONTEXT/upgrades/$test_arg" | cut -d'=' -f2)"
else
local upgrade_name="$test_arg"
fi
extra="$(jq -n --arg upgrade_name "$upgrade_name" '{ $upgrade_name }')" extra="$(jq -n --arg upgrade_name "$upgrade_name" '{ $upgrade_name }')"
elif [[ "$test_type" == "ACTIONS_CONFIG_PANEL" ]] && [[ "$test_arg" == "actions" ]] elif [[ "$test_type" == "ACTIONS_CONFIG_PANEL" ]] && [[ "$test_arg" == "actions" ]]
then then