From 08ebab32f916313df2e270025fac0d0f0fb87332 Mon Sep 17 00:00:00 2001 From: Abhi Sangeetha Date: Mon, 23 Sep 2024 12:04:17 -0400 Subject: [PATCH 1/8] testing m1 builders --- ci/build.yml | 2 +- ci/macOS.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ci/build.yml b/ci/build.yml index c3ac9cd5d45f..3a97eab8ba8d 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -102,7 +102,7 @@ jobs: parameters: job_name: m1 name: m1 - assignment: m1-builds + assignment: m1-builds-test test_mode: ${{parameters.test_mode}} - template: blackduck.yml diff --git a/ci/macOS.yml b/ci/macOS.yml index e9f9c38fa072..ac27d94342ad 100644 --- a/ci/macOS.yml +++ b/ci/macOS.yml @@ -16,8 +16,7 @@ jobs: name: macOS-pool demands: assignment -equals ${{parameters.assignment}} condition: and(succeeded(), - or(eq('${{parameters.name}}', 'macos'), - and(or(eq(variables['Build.SourceBranchName'], 'main'), + or(and(or(eq(variables['Build.SourceBranchName'], 'main'), eq(variables['Build.SourceBranchName'], 'main-2.x')), eq(dependencies.check_for_release.outputs['out.is_release'], 'false')))) variables: From ab2b0d367411ae11c32cb560cd8abcf8cfbcdd36 Mon Sep 17 00:00:00 2001 From: Abhi Sangeetha Date: Mon, 23 Sep 2024 12:37:28 -0400 Subject: [PATCH 2/8] Testing Mac m1 builder, removing conditional builds for testing --- ci/macOS.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ci/macOS.yml b/ci/macOS.yml index ac27d94342ad..51b65a46e9f2 100644 --- a/ci/macOS.yml +++ b/ci/macOS.yml @@ -15,10 +15,6 @@ jobs: pool: name: macOS-pool demands: assignment -equals ${{parameters.assignment}} - condition: and(succeeded(), - or(and(or(eq(variables['Build.SourceBranchName'], 'main'), - eq(variables['Build.SourceBranchName'], 'main-2.x')), - eq(dependencies.check_for_release.outputs['out.is_release'], 'false')))) variables: - name: release_sha value: $[ dependencies.check_for_release.outputs['out.release_sha'] ] From 1cb579922a8a5363db65ab63897a4d0a9b1264e8 Mon Sep 17 00:00:00 2001 From: Abhi Sangeetha Date: Mon, 23 Sep 2024 13:20:35 -0400 Subject: [PATCH 3/8] Testing Mac m1 builder, removing conditional builds for testing --- ci/macOS.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ci/macOS.yml b/ci/macOS.yml index 51b65a46e9f2..37b7e9b74bb8 100644 --- a/ci/macOS.yml +++ b/ci/macOS.yml @@ -27,8 +27,7 @@ jobs: - template: job-variables.yml steps: # Do not record start/end times for m1 - - ${{ if eq(parameters.name, 'macos') }}: - - template: report-start.yml + - template: report-start.yml - template: clear-shared-segments-macos.yml - checkout: self - bash: | @@ -46,11 +45,8 @@ jobs: is_release: variables.is_release test_mode: ${{parameters.test_mode}} # Do not upload metrics for m1 - - ${{ if eq(parameters.name, 'macos') }}: - - template: upload-bazel-metrics.yml + - template: upload-bazel-metrics.yml - template: tell-slack-failed.yml parameters: - trigger_sha: '$(trigger_sha)' - # Do not record start/end times for m1 - - ${{ if eq(parameters.name, 'macos') }}: - - template: report-end.yml + trigger_sha: '$(trigger_sha)' + - template: report-end.yml From b41bd7d59d77137b48a2ef3f7a60ee21968be497 Mon Sep 17 00:00:00 2001 From: Edward Newman Date: Mon, 30 Sep 2024 12:56:16 -0400 Subject: [PATCH 4/8] test --- ci/dev-env-install.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ci/dev-env-install.sh b/ci/dev-env-install.sh index 119813b6d903..b97e7efdb5f3 100755 --- a/ci/dev-env-install.sh +++ b/ci/dev-env-install.sh @@ -46,6 +46,7 @@ for i in `seq 10`; do nix-build --no-out-link nix -A tools -A ci-cached 2>&1 | tee nix_log || NIX_FAILED=1 # It should be in the last line but let’s use the last 3 and wildcards # to be robust against slight changes. + tail -50 nix_log if [[ $NIX_FAILED -ne 0 ]] && ([[ $(tail -n 3 nix_log) == *"unexpected end-of-file"* ]] || [[ $(tail -n 3 nix_log) == *"decompressing xz file"* ]]); then @@ -57,3 +58,7 @@ done if [[ $NIX_FAILED -ne 0 ]]; then exit 1 fi + +ls -lrt /nix/store/ak2* + + From 9e712e31e299ded1f86d2ae733abcf83de913ae9 Mon Sep 17 00:00:00 2001 From: Edward Newman Date: Mon, 30 Sep 2024 13:25:47 -0400 Subject: [PATCH 5/8] test --- ci/dev-env-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/dev-env-install.sh b/ci/dev-env-install.sh index b97e7efdb5f3..b06e4cec0c2d 100755 --- a/ci/dev-env-install.sh +++ b/ci/dev-env-install.sh @@ -46,7 +46,7 @@ for i in `seq 10`; do nix-build --no-out-link nix -A tools -A ci-cached 2>&1 | tee nix_log || NIX_FAILED=1 # It should be in the last line but let’s use the last 3 and wildcards # to be robust against slight changes. - tail -50 nix_log + tail -n 50 nix_log if [[ $NIX_FAILED -ne 0 ]] && ([[ $(tail -n 3 nix_log) == *"unexpected end-of-file"* ]] || [[ $(tail -n 3 nix_log) == *"decompressing xz file"* ]]); then @@ -59,6 +59,6 @@ if [[ $NIX_FAILED -ne 0 ]]; then exit 1 fi -ls -lrt /nix/store/ak2* +ls -lrt /nix/store/* || true From 7b0d145d6562027f35f6b350a59bad32c396ee60 Mon Sep 17 00:00:00 2001 From: Edward Newman Date: Mon, 30 Sep 2024 13:32:21 -0400 Subject: [PATCH 6/8] test --- ci/dev-env-install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/dev-env-install.sh b/ci/dev-env-install.sh index b06e4cec0c2d..293a8b6559f1 100755 --- a/ci/dev-env-install.sh +++ b/ci/dev-env-install.sh @@ -59,6 +59,8 @@ if [[ $NIX_FAILED -ne 0 ]]; then exit 1 fi +tail -n 500 nix_log +nix-build --no-out-link nix -A tools -A ci-cached 2>&1 ls -lrt /nix/store/* || true From 91c1e788518817dffac86fd9a588862c311441cc Mon Sep 17 00:00:00 2001 From: Edward Newman Date: Mon, 30 Sep 2024 13:41:33 -0400 Subject: [PATCH 7/8] test --- ci/dev-env-install.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ci/dev-env-install.sh b/ci/dev-env-install.sh index 293a8b6559f1..58fcdba17c69 100755 --- a/ci/dev-env-install.sh +++ b/ci/dev-env-install.sh @@ -47,6 +47,7 @@ for i in `seq 10`; do # It should be in the last line but let’s use the last 3 and wildcards # to be robust against slight changes. tail -n 50 nix_log + step "$i" if [[ $NIX_FAILED -ne 0 ]] && ([[ $(tail -n 3 nix_log) == *"unexpected end-of-file"* ]] || [[ $(tail -n 3 nix_log) == *"decompressing xz file"* ]]); then @@ -59,8 +60,14 @@ if [[ $NIX_FAILED -ne 0 ]]; then exit 1 fi +step "Checking for existence of Bazel" + +ls -l * + tail -n 500 nix_log + nix-build --no-out-link nix -A tools -A ci-cached 2>&1 + ls -lrt /nix/store/* || true From 82ada405112e05a393aed8490eece49626356c3c Mon Sep 17 00:00:00 2001 From: Abhi Sangeetha Date: Mon, 30 Sep 2024 15:09:08 -0400 Subject: [PATCH 8/8] testing build on m1 --- ci/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/build.yml b/ci/build.yml index 3a97eab8ba8d..3d074f8406d6 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -95,7 +95,7 @@ jobs: parameters: job_name: macOS name: macos - assignment: default + assignment: default test_mode: ${{parameters.test_mode}} - template: macOS.yml