Merge branch 'latest' into net

Signed-off-by: Matthieu Baerts (NGI0) <[email protected]>

Author: matttbe

entrypoint.sh

@@ -814,20 +814,18 @@ build_packetdrill() { local old_pwd kversion branch rc=0
 	return ${rc}
 }
 
-prepare() { local mode no_tap=1
+build_tests() { local mode
 	mode="${1}"
 
-	printinfo "Prepare the environment"
-
 	build_selftests
 	if is_mode_btf "${mode}"; then
 		build_bpftests
 	fi
 	build_packetdrill
+}
 
-	if is_ci; then
-		no_tap=0 # we want subtests
-	fi
+prepare() {
+	printinfo "Prepare the environment"
 
 	cat <<EOF > "${BASH_PROFILE}"
 export KERNEL_BUILD_DIR="${VIRTME_BUILD_DIR}"
@@ -842,6 +840,40 @@ EOF
 		echo "PS1='${ps1}'" >> "${BASH_PROFILE}"
 	fi
 
+	if [ -f "${VIRTME_PREPARE_POST}" ]; then
+		# shellcheck source=/dev/null
+		source "${VIRTME_PREPARE_POST}"
+	fi
+}
+
+run() {
+	printinfo "Run the virtme script: manual"
+
+	"${VIRTME_RUN}" "${VIRTME_RUN_OPTS[@]}" ${VIRTME_RUN_QEMU_OPTS:+--qemu-opts "${VIRTME_RUN_QEMU_OPTS[@]}"}
+}
+
+run_expect() { local mode timestamps_sec_stop no_tap=1
+	mode="${1}"
+
+	EXPECT=1
+
+	if is_ci; then
+		no_tap=0 # we want subtests
+		timestamps_sec_stop=$(date +%s)
+
+		# max - compilation time - before/after script
+		VIRTME_EXPECT_TEST_TIMEOUT=$((INPUT_CI_TIMEOUT_SEC - (timestamps_sec_stop - TIMESTAMPS_SEC_START) - VIRTME_CI_ESTIMATED_EXTRA_TIME))
+	else
+		# disable timeout
+		VIRTME_EXPECT_TEST_TIMEOUT="${INPUT_EXPECT_TIMEOUT}"
+	fi
+
+	# force a stop in case of panic, but avoid a reboot in "expect" mode
+	VIRTME_RUN_OPTS+=(--kopt panic=-1)
+	VIRTME_RUN_QEMU_OPTS+=(-no-reboot)
+
+	printinfo "Run the virtme script: expect (timeout: ${VIRTME_EXPECT_TEST_TIMEOUT})"
+
 	cat <<EOF > "${VIRTME_SCRIPT}"
 #! /bin/bash
 
@@ -1307,39 +1339,6 @@ echo "${VIRTME_SCRIPT_END}"
 EOF
 	chmod +x "${VIRTME_SCRIPT}"
 
-	if [ -f "${VIRTME_PREPARE_POST}" ]; then
-		# shellcheck source=/dev/null
-		source "${VIRTME_PREPARE_POST}"
-	fi
-}
-
-run() {
-	printinfo "Run the virtme script: manual"
-
-	"${VIRTME_RUN}" "${VIRTME_RUN_OPTS[@]}" ${VIRTME_RUN_QEMU_OPTS:+--qemu-opts "${VIRTME_RUN_QEMU_OPTS[@]}"}
-}
-
-run_expect() {
-	local timestamps_sec_stop
-
-	EXPECT=1
-
-	if is_ci; then
-		timestamps_sec_stop=$(date +%s)
-
-		# max - compilation time - before/after script
-		VIRTME_EXPECT_TEST_TIMEOUT=$((INPUT_CI_TIMEOUT_SEC - (timestamps_sec_stop - TIMESTAMPS_SEC_START) - VIRTME_CI_ESTIMATED_EXTRA_TIME))
-	else
-		# disable timeout
-		VIRTME_EXPECT_TEST_TIMEOUT="${INPUT_EXPECT_TIMEOUT}"
-	fi
-
-	# force a stop in case of panic, but avoid a reboot in "expect" mode
-	VIRTME_RUN_OPTS+=(--kopt panic=-1)
-	VIRTME_RUN_QEMU_OPTS+=(-no-reboot)
-
-	printinfo "Run the virtme script: expect (timeout: ${VIRTME_EXPECT_TEST_TIMEOUT})"
-
 	cat <<EOF > "${VIRTME_SCRIPT_TIMEOUT}"
 #! /bin/bash
 DUMP_SEC=60
@@ -1398,7 +1397,7 @@ set timeout "1"
 
 for {set i 0} {\$i < 60} {incr i 1} {
 	expect {
-		"root@" {
+		"root@${INPUT_HOSTNAME}" {
 			send_user "\n$(log_section_end)"
 			send_user "Starting the validation script (after \$i sec)\n"
 			break
@@ -1735,7 +1734,8 @@ prepare_all() { local t mode
 	setup_env "${mode}"
 	gen_kconfig "${@}"
 	build
-	prepare "${mode}"
+	build_tests "${mode}"
+	prepare
 }
 
 # $1: mode ; [ $2+: kconfig ]
@@ -1750,7 +1750,7 @@ go_expect() {
 	check_source_exec_all
 
 	prepare_all auto "${@}"
-	run_expect
+	run_expect "${@}"
 	analyze "${@}"
 }
 
@@ -2000,12 +2000,15 @@ case "${INPUT_MODE}" in
 	"vm" | "vm-manual")
 		setup_env "${@:-normal}"
 		[ "${INPUT_PACKETDRILL_STABLE}" = "1" ] && build_packetdrill
+		prepare
 		run
 		;;
 	"vm-expect" | "vm-auto")
+		check_source_exec_all
 		setup_env "${@:-normal}"
 		[ "${INPUT_PACKETDRILL_STABLE}" = "1" ] && build_packetdrill
-		run_expect
+		prepare
+		run_expect "${@:-normal}"
 		analyze "${@:-normal}"
 		;;
 	"connect")