commit 4254673c5030868ecbebdf45de790b33fa10f829
author Kasia Kucharczyk <2536609+kkucharc@users.noreply.github.com> Mon Jan 20 11:28:21 2020 +0100
committer GitHub <noreply@github.com> Mon Jan 20 11:28:21 2020 +0100
tree 9997dcc7f277410d67b93cf786d98a2b2e71034a
parent ebe8bdc290395378aa59d5baaa7712335b147572
parent c188c1573c2c5b11477daa107edcb7e02ea7e064

Merge pull request #10639: [BEAM-8939] Report status code 0 when no stale jobs are found

.test-infra/tools/stale_dataflow_jobs_cleaner.sh

diff --git a/.test-infra/tools/stale_dataflow_jobs_cleaner.sh b/.test-infra/tools/stale_dataflow_jobs_cleaner.sh
index 66bf880..e563048 100755
--- a/.test-infra/tools/stale_dataflow_jobs_cleaner.sh
+++ b/.test-infra/tools/stale_dataflow_jobs_cleaner.sh
@@ -19,5 +19,11 @@
 #
 set -euo pipefail
 
-gcloud dataflow jobs list --created-before=-P3H --format='value(JOB_ID)' \
---status=active --region=us-central1 | xargs gcloud dataflow jobs cancel
+STALE_JOBS=$(gcloud dataflow jobs list --created-before=-P3H \
+--format='value(JOB_ID)' --status=active --region=us-central1)
+
+if [[ ${STALE_JOBS} ]]; then
+  gcloud dataflow jobs cancel --region=us-central1 ${STALE_JOBS}
+else
+  echo "No stale jobs found."
+fi