From aae816369637021888eaf0fa22254e5f364eea7d Mon Sep 17 00:00:00 2001 From: holger krekel Date: Sun, 23 Aug 2020 08:03:40 +0200 Subject: [PATCH 1/2] try harder to let all build processes die when ssh dies --- ci_scripts/remote_python_packaging.sh | 2 ++ ci_scripts/remote_tests_python.sh | 6 +++++- ci_scripts/remote_tests_rust.sh | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ci_scripts/remote_python_packaging.sh b/ci_scripts/remote_python_packaging.sh index 61f2e8c9a..bac219198 100755 --- a/ci_scripts/remote_python_packaging.sh +++ b/ci_scripts/remote_python_packaging.sh @@ -30,6 +30,8 @@ set +x ssh $SSHTARGET bash -c "cat >$BUILDDIR/exec_docker_run" <<_HERE set +x -e + # make sure all processes exit when ssh dies + shopt -s huponexit cd $BUILDDIR export DCC_PY_LIVECONFIG=$DCC_PY_LIVECONFIG export DCC_NEW_TMP_EMAIL=$DCC_NEW_TMP_EMAIL diff --git a/ci_scripts/remote_tests_python.sh b/ci_scripts/remote_tests_python.sh index 05df27417..99b4d0169 100755 --- a/ci_scripts/remote_tests_python.sh +++ b/ci_scripts/remote_tests_python.sh @@ -22,8 +22,12 @@ set +x echo "--- Running $CIRCLE_JOB remotely" -ssh $SSHTARGET <<_HERE +ssh -t -t $SSHTARGET <<_HERE set +x -e + + # make sure all processes exit when ssh dies + shopt -s huponexit + export RUSTC_WRAPPER=\`which sccache\` cd $BUILDDIR # let's share the target dir with our last run on this branch/job-type diff --git a/ci_scripts/remote_tests_rust.sh b/ci_scripts/remote_tests_rust.sh index 0e2ea280f..3679232b2 100755 --- a/ci_scripts/remote_tests_rust.sh +++ b/ci_scripts/remote_tests_rust.sh @@ -18,8 +18,10 @@ rsync --delete --files-from=.rsynclist -az ./ "$SSHTARGET:$BUILDDIR" echo "--- Running $CIRCLE_JOB remotely" -ssh $SSHTARGET <<_HERE +ssh -t -t $SSHTARGET <<_HERE set +x -e + # make sure all processes exit when ssh dies + shopt -s huponexit export RUSTC_WRAPPER=\`which sccache\` cd $BUILDDIR # let's share the target dir with our last run on this branch/job-type From fd54b6b5b13975753877da0d1ed203f0036b4b85 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Sun, 23 Aug 2020 08:37:38 +0200 Subject: [PATCH 2/2] another try --- ci_scripts/remote_python_packaging.sh | 2 +- ci_scripts/remote_tests_python.sh | 2 +- ci_scripts/remote_tests_rust.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci_scripts/remote_python_packaging.sh b/ci_scripts/remote_python_packaging.sh index bac219198..c185b78b1 100755 --- a/ci_scripts/remote_python_packaging.sh +++ b/ci_scripts/remote_python_packaging.sh @@ -46,7 +46,7 @@ _HERE echo "--- Running $CIRCLE_JOB remotely" -ssh -t $SSHTARGET bash "$BUILDDIR/exec_docker_run" +ssh $SSHTARGET bash "$BUILDDIR/exec_docker_run" mkdir -p workspace rsync -avz "$SSHTARGET:$BUILDDIR/python/.docker-tox/wheelhouse/*manylinux201*" workspace/wheelhouse/ rsync -avz "$SSHTARGET:$BUILDDIR/python/.docker-tox/dist/*" workspace/wheelhouse/ diff --git a/ci_scripts/remote_tests_python.sh b/ci_scripts/remote_tests_python.sh index 99b4d0169..e787a734e 100755 --- a/ci_scripts/remote_tests_python.sh +++ b/ci_scripts/remote_tests_python.sh @@ -22,7 +22,7 @@ set +x echo "--- Running $CIRCLE_JOB remotely" -ssh -t -t $SSHTARGET <<_HERE +ssh $SSHTARGET <<_HERE set +x -e # make sure all processes exit when ssh dies diff --git a/ci_scripts/remote_tests_rust.sh b/ci_scripts/remote_tests_rust.sh index 3679232b2..5498d38ef 100755 --- a/ci_scripts/remote_tests_rust.sh +++ b/ci_scripts/remote_tests_rust.sh @@ -18,7 +18,7 @@ rsync --delete --files-from=.rsynclist -az ./ "$SSHTARGET:$BUILDDIR" echo "--- Running $CIRCLE_JOB remotely" -ssh -t -t $SSHTARGET <<_HERE +ssh $SSHTARGET <<_HERE set +x -e # make sure all processes exit when ssh dies shopt -s huponexit