This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new 9eae6621e8 Fix failing "ARM cache" build (#33609)
9eae6621e8 is described below

commit 9eae6621e86c1d2312b36c90bd9df7ac81c83315
Author: Jarek Potiuk <[email protected]>
AuthorDate: Tue Aug 22 14:30:12 2023 +0200

    Fix failing "ARM cache" build (#33609)
    
    The new version of autossh installed yesterday when our AMI has
    been refreshed is a little less verbose when printing AUTOSSH_LOG
    entries. So far it produced entries for starting and running the
    autossh - which was not intersting if nothing was wrong:
    
    ```
    2023/08/21 06:33:27 autossh[31898]: starting ssh (count 1)
    2023/08/21 06:33:27 autossh[31898]: ssh child pid is 31899
    ```
    
    The new versio will not produce any output and wont even create
    a file when nothing wrong happens and this caused our CI
    to fail at the very last moment - after the ARM instance has
    been stopped.
    
    This PR won't fail when the autossh log is missing.
---
 scripts/ci/images/ci_stop_arm_instance.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/ci/images/ci_stop_arm_instance.sh 
b/scripts/ci/images/ci_stop_arm_instance.sh
index 94e14623e0..57a42c80a3 100755
--- a/scripts/ci/images/ci_stop_arm_instance.sh
+++ b/scripts/ci/images/ci_stop_arm_instance.sh
@@ -24,8 +24,7 @@ function stop_arm_instance() {
     INSTANCE_ID=$(jq < "${INSTANCE_INFO}" ".Instances[0].InstanceId" -r)
     docker buildx rm --force airflow_cache || true
     aws ec2 terminate-instances --instance-ids "${INSTANCE_ID}"
-    cat ${AUTOSSH_LOGFILE}
-
+    cat ${AUTOSSH_LOGFILE} || true
 }
 
 stop_arm_instance

Reply via email to