Merge pull request GoogleCloudPlatform#4726 from arpit974/startup_script_test_fix

updating startup script wait message to fix build failures.

* Added support for two additional log lines (`google-startup-scripts.service: Succeeded.` and `Finished Google Compute Engine Startup Scripts.`) to be recognized as indicators of successful startup script completion in `wait-for-startup-status.sh`.
* Updated the log filtering logic in `wait-for-startup-status.sh` to include the new success indicators when searching for completion status.
* Modified the script's exit logic to explicitly check for the new success log lines and exit with success if they are detected.

Author: arpit974

community/modules/scripts/wait-for-startup/scripts/wait-for-startup-status.sh

@@ -60,6 +60,10 @@ FINISH_LINE="startup-script exit status"
 # Match string for failures on the new guest agent
 FINISH_LINE_ERR="Script.*failed with error:"
 
+# NEW: Accept also these finish lines as success.
+STARTUP_SCRIPT_SUCCEEDED_LINE="google-startup-scripts.service: Succeeded."
+STARTUP_SCRIPT_FINISHED_LINE="Finished Google Compute Engine Startup Scripts."
+
 NON_FATAL_ERRORS=(
 	"Internal error"
 )
@@ -68,7 +72,7 @@ until [[ now -gt deadline ]]; do
 	ser_log=$(
 		set -o pipefail
 		${fetch_cmd} 2>"${error_file}" |
-			c1grep "${FINISH_LINE}\|${FINISH_LINE_ERR}"
+			c1grep "${FINISH_LINE}\|${FINISH_LINE_ERR}\|${STARTUP_SCRIPT_SUCCEEDED_LINE}\|${STARTUP_SCRIPT_FINISHED_LINE}"
 	) || {
 		err=$(cat "${error_file}")
 		echo "$err"
@@ -100,6 +104,12 @@ if [[ "${STATUS}" == 0 ]]; then
 elif [[ "${STATUS}" == 1 ]]; then
 	echo "startup-script finished with errors, ${INSPECT_OUTPUT_TEXT}"
 	echo "${fetch_cmd}"
+elif echo "${ser_log}" | grep -qE "${STARTUP_SCRIPT_SUCCEEDED_LINE}"; then
+	echo "startup-script finished successfully (startup script succeeded line detected)"
+	exit 0
+elif echo "${ser_log}" | grep -qE "${STARTUP_SCRIPT_FINISHED_LINE}"; then
+	echo "startup-script finished successfully (startup script finished line detected)"
+	exit 0
 elif [[ now -ge deadline ]]; then
 	echo "startup-script timed out after ${TIMEOUT} seconds"
 	echo "${INSPECT_OUTPUT_TEXT}"

tools/cloud-build/daily-tests/ansible_playbooks/tasks/wait-for-startup-script.yml

@@ -19,7 +19,7 @@
 
 - name: Wait for startup script to complete
   become: true
-  ansible.builtin.shell: journalctl -u google-startup-scripts.service -b | grep "Started Google Compute Engine Startup Scripts."
+  ansible.builtin.shell: journalctl -u google-startup-scripts.service -b | grep -E "Started Google Compute Engine Startup Scripts\.|Finished Google Compute Engine Startup Scripts\.|Finished google-startup-scripts.service - Google Compute Engine Startup Scripts\."
   register: result
   until: result.rc == 0
   retries: "{{ (timeout_seconds/5)|int }}"