add job attempt to logs (digital-asset#17091)

For the used-to-be-rare-but-not-so-much-anymore case where the job fails after having pushed its logs (without this the push fails as we can't overwrite artifacts).
kgeonw · Jul 6, 2023 · 242fe0f · 242fe0f
1 parent 53556da
commit 242fe0f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -66,7 +66,7 @@ bazel build //... `
   `-`-experimental_profile_include_target_label `
   `-`-build_event_json_file build-events.json `
   `-`-build_event_publish_all_actions `
-  `-`-experimental_execution_log_file ${ARTIFACT_DIRS}/logs/build_execution_windows.log `
+  `-`-experimental_execution_log_file ${ARTIFACT_DIRS}/logs/build_execution_windows$env:SYSTEM_JOBATTEMPT.log `
   `-`-build_tag_filters=-canton-ee
 
 bazel shutdown
@@ -85,6 +85,6 @@ if ($env:SKIP_TESTS -ceq "False") {
       `-`-experimental_profile_include_target_label `
       `-`-build_event_json_file test-events.json `
       `-`-build_event_publish_all_actions `
-      `-`-experimental_execution_log_file ${ARTIFACT_DIRS}/logs/test_execution_windows.log `
+      `-`-experimental_execution_log_file ${ARTIFACT_DIRS}/logs/test_execution_windows_$env:SYSTEM_JOBATTEMPT.log `
       `-`-test_tag_filters=-canton-ee
 }
diff --git a/build.sh b/build.sh
@@ -6,7 +6,7 @@ set -euo pipefail
 
 eval "$("$(dirname "$0")/dev-env/bin/dade-assist")"
 
-execution_log_postfix=${1:-}
+execution_log_postfix=${1:-}${2:-}
 
 export LC_ALL=en_US.UTF-8
 

diff --git a/ci/build-unix.yml b/ci/build-unix.yml
@@ -35,10 +35,11 @@ steps:
   - bash: |
       set -euo pipefail
       p="_${{parameters.name}}"
+      a="_$(System.JobAttempt)"
       if [ "$p" == "_m1" ]; then
-          ./build.sh $p || ./build.sh $p || ./build.sh $p || ./build.sh $p
+          ./build.sh $p $a || ./build.sh $p $a || ./build.sh $p $a || ./build.sh $p $a
       else
-          ./build.sh $p
+          ./build.sh $p $a
       fi
     displayName: 'Build'
     env: