ci: unset hosted env in test step

Author: lox

.buildkite/hooks/pre-command

@@ -12,11 +12,3 @@ mkdir -p \
 export GOCACHE="${cache_root}/go/build"
 export GOMODCACHE="${cache_root}/go/pkg/mod"
 export GOLANGCI_LINT_CACHE="${cache_root}/golangci-lint"
-
-if [[ "${BUILDKITE_STEP_KEY:-}" == "test" ]]; then
-  # Hosted agents inject the pipeline org and API token into the step
-  # environment. A subset of CLI tests exercise config precedence and must not
-  # inherit those ambient overrides, or they resolve the live Buildkite org
-  # instead of the fixture-backed test config.
-  unset BUILDKITE_API_TOKEN BUILDKITE_ORGANIZATION_SLUG
-fi

.buildkite/pipeline.yml

@@ -17,6 +17,9 @@ steps:
     artifact_paths:
       - cover-tree.svg
     commands:
+      # Hosted agents inject org/token env that breaks config-precedence tests,
+      # so clear those variables in the command shell right before go test.
+      - unset BUILDKITE_ORGANIZATION_SLUG BUILDKITE_API_TOKEN
       - go test -coverprofile cover.out ./...
       - go run github.com/nikolaydubina/go-cover-treemap@v1.5.1 -coverprofile cover.out > cover-tree.svg
       - echo '<details><summary>Coverage tree map</summary><img src="artifact://cover-tree.svg" alt="Test coverage tree map" width="70%"></details>' | buildkite-agent annotate --style "info"