armbian/autotests
0
0
Fork 0
mirror of https://github.com/armbian/autotests.git synced 2026-01-06 10:31:09 -08:00
Code Issues Packages Projects Releases Wiki Activity

Small tweaks

Browse Source
This commit is contained in:
Igor Pecovnik
2020-12-28 12:27:37 +00:00
parent 58011b35c3
commit 1108d2be34
6 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
go.sh
View File

@@ -215,7 +215,8 @@ for USER_HOST in "${hostarray[@]}"; do
# switch to stable build, current branch from repository if not already there
#if [[ -n "$BOARD_IMAGE_TYPE" && "$BOARD_IMAGE_TYPE" != stable && $BOARD_BRANCH != current && $FRESH == yes ]]; then
if [[ -n "$BOARD_IMAGE_TYPE" && $FRESH == yes ]]; then
if [[ -n "$BOARD_IMAGE_TYPE" && $FRESH == "stable" ]]; then
display_alert "Switch to stable builds" "$(date +%R:%S)" "wrn"
remote_exec "apt update; apt -y -qq install armbian-config; \
LANG=C armbian-config main=System selection=Stable branch=$BOARD_BRANCH" "-t" &>/dev/null
@@ -229,7 +230,7 @@ done
# show diff to previous build
display_alert "Diff to previous build" "added or removed" "info"
cat ${SRC}/reports/data.out | cut -d$'"' -f 4 | sed 's/.*/"&"/' | sort | uniq | awk -F"\"" '{print $2}' > ${SRC}/reports/data.out.txt
cat ${SRC}/reports/data.in ${SRC}/reports/data.out | cut -d$'"' -f 4 | sed 's/.*/"&"/' | sort | uniq | awk -F"\"" '{print $2}' | diff ${SRC}/reports/data.out.txt - | grep ">"
[[ -f ${SRC}/reports/data.in ]] && cat ${SRC}/reports/data.in ${SRC}/reports/data.out | cut -d$'"' -f 4 | sed 's/.*/"&"/' | sort | uniq | awk -F"\"" '{print $2}' | diff ${SRC}/reports/data.out.txt - | grep ">"
#cp ${SRC}/reports/data.out ${SRC}/reports/data.in
@@ -292,8 +293,8 @@ echo "This whole procedure took "$((($(date +%s) - $START)/60))" minutes".
if [[ -n $UPLOAD_SERVER && -n $UPLOAD_LOCATION ]]; then
# upload report
rsync -arP --delete ${SRC}/reports/${REPORT}.html -e 'ssh -p 22' ${UPLOAD_SERVER}:${UPLOAD_LOCATION}"autotest.html"
rsync -arP --delete ${SRC}/reports/${REPORT}.html -e 'ssh -p 22' ${UPLOAD_SERVER}:${UPLOAD_LOCATION}"${REPORT}.html"
# set link to latest
#ssh ${UPLOAD_SERVER} "cd ${UPLOAD_LOCATION} ; ln -sf ${REPORT}.html latest.html"
ssh ${UPLOAD_SERVER} "cd ${UPLOAD_LOCATION} ; ln -sf ${REPORT}.html latest.html"
fi

2
init/0000-armbian-first-login.bash
View File

@@ -23,6 +23,8 @@ MAKE_USER=$(expect -c "
send \"${PASS_ROOT}\r\"
expect \"Repeat password: \"
send \"${PASS_ROOT}\r\"
expect \"Choose default system command shell: \"
send \"2\r\"
expect \"*your forename): \"
send \"${USER_NORMAL}\r\"
expect \"Create password:\"

1
lib/functions.sh
View File

@@ -228,6 +228,7 @@ while [ $r -le ${PASSES} ]
for u in "${array[@]}"
do
unset TEST_OUTPUT
get_board_data
DATA_ALIGN="center"
. $u
[[ $TEST_SKIP != "true" ]] && BODY_HTML+="\t<td align=$DATA_ALIGN>$TEST_OUTPUT</td>"

2
tests/9000-nigtly-stable-switch.bash
View File

@@ -14,7 +14,7 @@ case "$r" in
display_alert "Switch to nightly builds, branch current" "................................." "info"
remote_exec "armbian-config main=System selection=Nightly branch=current" "-t" "10m" &>/dev/null
;;
22222)
2)
display_alert "Switch to nightly builds, branch dev" "................................." "info"
remote_exec "armbian-config main=System selection=Nightly branch=dev" "-t" "10m" &>/dev/null
;;

0
tests/9003-u-boot-upgrade.bash.disabled → tests/9003-u-boot-upgrade.bash
View File

4
tests/9999-reboot.bash
View File

@@ -8,5 +8,5 @@ TEST_SKIP="true"
display_alert "$(basename $BASH_SOURCE)" "$(date +%R:%S)" "info"
display_alert "Rebooting in 3 seconds" "${BOARD_NAME}" "info"
sleep 3
remote_exec "reboot" &>/dev/null
sleep 20
remote_exec "reboot"
sleep 10