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

Fixes after tests on the battlefield

Browse source
This commit is contained in:
Alexandre Aubin 2023-01-28 04:13:46 +01:00
parent a65f16dd08
commit 25dadd002c
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/common.sh
View file

@ -247,11 +247,11 @@ function fetch_package_to_test() {
# Force the branch master if no branch is specified. # Force the branch master if no branch is specified.
if [ -z "$gitbranch" ] if [ -z "$gitbranch" ]
then then
if git ls-remote --quiet --exit-code $path_to_package_to_test master if git ls-remote --quiet --exit-code $path_to_package_to_test master >/dev/null
then then
gitbranch="-b master" gitbranch="-b master"
else else
if git ls-remote --quiet --exit-code $path_to_package_to_test stable if git ls-remote --quiet --exit-code $path_to_package_to_test stable >/dev/null
then then
gitbranch="-b stable" gitbranch="-b stable"
else else

7
lib/lxc.sh
View file

@ -81,7 +81,8 @@ LOAD_LXC_SNAPSHOT () {
LXC_STOP $LXC_NAME LXC_STOP $LXC_NAME
lxc restore $LXC_NAME $snapname lxc restore $LXC_NAME $snapname || log_error "Failed to restore snapshot ? The next step may miserably crash because of this ... if this happens to often, maybe restarting the LXD daemon can help ..."
lxc start $LXC_NAME lxc start $LXC_NAME
_LXC_START_AND_WAIT $LXC_NAME _LXC_START_AND_WAIT $LXC_NAME
} }
@ -132,7 +133,7 @@ LXC_RESET () {
LXC_STOP $LXC_NAME LXC_STOP $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 -r '.[].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/$LXC_NAME/rootfs/swap" 2>/dev/null
fi fi
@ -142,7 +143,7 @@ LXC_RESET () {
_LXC_START_AND_WAIT() { _LXC_START_AND_WAIT() {
restart_container() restart_container()
{ {
LXC_STOP $1 LXC_STOP $1
lxc start "$1" lxc start "$1"

9
lib/tests_coordination.sh
View file

@ -11,8 +11,8 @@ readonly summary_png="./summary_${WORKER_ID}.png"
# Purge some log files # Purge some log files
rm -f "$full_log" && touch "$full_log" rm -f "$full_log" && touch "$full_log"
rm $result_json rm -f $result_json
rm $summary_png rm -f $summary_png
# Redirect fd 3 (=debug steam) to full log # Redirect fd 3 (=debug steam) to full log
exec 3>>$full_log exec 3>>$full_log
@ -96,7 +96,10 @@ run_all_tests() {
# End the timer for the test # End the timer for the test
stop_timer all_tests stop_timer all_tests
echo "You can find the complete log of these tests in $(realpath $complete_log)" if [[ "$IN_YUNORUNNER" != "1" ]]
then
echo "You can find the complete log of these tests in $(realpath $full_log)"
fi
} }