Skip to content

Commit 44a33e5

Browse files
authored
ci(build): use bash instead of zsh on tart macOS runners (#18987)
## Description Follow-up to #17501. It was requested in the past to use `bash` over `zsh` in the jobs using that tart runners. Sets `TART_EXECUTOR_SHELL="/bin/bash -l"` on the tart macOS jobs so the [gitlab-tart-executor](https://github.com/cirruslabs/gitlab-tart-executor) runs bash instead of the VM's default zsh. This removes the zsh-specific workarounds that were added when the tart runners were introduced: - `setopt shwordsplit` in `build macos arm64`'s `before_script` - `FF_SCRIPT_SECTIONS: "false"` on `build macos arm64` and `os tests macos` (disabled because GitLab's collapsible script-section wrapper was incompatible with zsh) Also renames the runner tag from `macos:sonoma-tart` to `macos:tart`. ## Testing - [x] CI pipeline passes with `build macos arm64` and `os tests macos` running under bash on `macos:tart` runners ## Additional Notes CI-only change, no user-facing impact — will add the `changelog/no-changelog` label. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: andrewzh.lee <andrewzh.lee@datadoghq.com>
1 parent ae5f13b commit 44a33e5

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

.gitlab/multi-os-tests.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,16 @@ os tests ubuntu:
3434
- apt-get update && apt-get install -y curl
3535
- bash .gitlab/scripts/multi-os-tests.sh
3636

37-
# Tart VMs default to using zsh instead of bash
3837
os tests macos:
3938
extends: .multi_os_test_base
4039
image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-trace-py-sonoma-latest"
41-
tags: ["macos:sonoma-tart"]
40+
tags: ["macos:tart"]
4241
needs: [ "build macos arm64" ]
4342
variables:
4443
WHEEL_PATTERN: "macosx*arm64.whl"
4544
PLATFORM: "macOS"
46-
# Disables collapsable sections in multi-line scripts due to incompatibility with zsh
47-
FF_SCRIPT_SECTIONS: "false"
45+
# Use bash instead of the Tart VM's default zsh
46+
TART_EXECUTOR_SHELL: "/bin/bash -l"
4847
script:
4948
- |
5049
for PYTHON_VERSION in 3.10 3.12 3.14; do

.gitlab/package.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,19 +171,17 @@ variables:
171171
variables:
172172
ARCH_TAG: "amd64"
173173

174-
# Tart VMs default to using zsh instead of bash
175174
"build macos arm64":
176175
extends: .build_macos_base
177176
image: "486234852809.dkr.ecr.us-east-1.amazonaws.com/ci/ci-platform-machine-images/tart-vm:dd-trace-py-sonoma-latest"
178-
tags: [ "macos:sonoma-tart" ]
177+
tags: [ "macos:tart" ]
179178
variables:
180179
ARCH_TAG: "arm64"
181-
# Disables collapsable sections in multi-line scripts due to incompatibility with zsh
182-
FF_SCRIPT_SECTIONS: "false"
180+
# Use bash instead of the Tart VM's default zsh
181+
TART_EXECUTOR_SHELL: "/bin/bash -l"
183182
SCCACHE_BUCKET: "dd-sccache-storage-us1-ddbuild-io"
184183
SCCACHE_REGION: "us-east-1"
185184
before_script: |
186-
setopt shwordsplit 2>/dev/null || true
187185
set -euo pipefail
188186
# sccache hardcodes the IMDS IP (169.254.169.254) and ignores $AWS_EC2_METADATA_SERVICE_ENDPOINT,
189187
# so resolve creds from the tart iam-proxy beforehand

0 commit comments

Comments
 (0)