diff --git a/.bazelrc b/.bazelrc index 268dc48620ee..5b7147ac3665 100644 --- a/.bazelrc +++ b/.bazelrc @@ -61,16 +61,15 @@ test:race --heavy # CI uses a custom timeout for enormous targets. test:use_ci_timeouts --test_timeout=60,300,900,900 + # CI should always run with `--config=ci`. -build:cibase --config=lintonbuild # Set `-test.v` in Go tests. # Ref: https://github.com/bazelbuild/rules_go/pull/2456 -test:cibase --test_env=GO_TEST_WRAP_TESTV=1 +test:ci --test_env=GO_TEST_WRAP_TESTV=1 # Dump all output for failed tests to the build log. test:ci --test_output=errors # Put all tmp artifacts in /artifacts/tmp. test:ci --test_tmpdir=/artifacts/tmp -build:ci --config=cibase build:cross --stamp @@ -132,7 +131,8 @@ build:engflowbase --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1 build:engflowbase --extra_execution_platforms=//build/toolchains:cross_linux build:engflowbase --remote_upload_local_results=false build:engflowbase --remote_download_toplevel -build:engflowbase --config=cibase +build:engflowbase --test_env=GO_TEST_WRAP_TESTV=1 +build:engflowbase --config=lintonbuild test:engflowbase --test_env=REMOTE_EXEC=1 test:engflowbase --test_env=GOTRACEBACK=all build:engflow --config=engflowbase diff --git a/build/teamcity/cockroach/ci/builds/build_impl.sh b/build/teamcity/cockroach/ci/builds/build_impl.sh index 6718a38e3c45..6849eb2a11dd 100755 --- a/build/teamcity/cockroach/ci/builds/build_impl.sh +++ b/build/teamcity/cockroach/ci/builds/build_impl.sh @@ -42,10 +42,10 @@ then GEOS_TARGET= fi -bazel build //pkg/cmd/bazci --config=ci -BAZEL_BIN=$(bazel info bazel-bin --config=ci) +bazel build //pkg/cmd/bazci +BAZEL_BIN=$(bazel info bazel-bin) "$BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci" -- build -c opt \ - --config "$CONFIG" --config ci $EXTRA_ARGS \ + --config "$CONFIG" $EXTRA_ARGS \ //pkg/cmd/cockroach-short //pkg/cmd/cockroach \ //pkg/cmd/cockroach-sql $GEOS_TARGET $EXTRA_TARGETS diff --git a/build/teamcity/cockroach/ci/tests-aws-linux-arm64-bigvm/unit_tests_impl.sh b/build/teamcity/cockroach/ci/tests-aws-linux-arm64-bigvm/unit_tests_impl.sh index 33d79945e12f..c5fa1c8218c1 100755 --- a/build/teamcity/cockroach/ci/tests-aws-linux-arm64-bigvm/unit_tests_impl.sh +++ b/build/teamcity/cockroach/ci/tests-aws-linux-arm64-bigvm/unit_tests_impl.sh @@ -12,7 +12,7 @@ dir="$(dirname $(dirname $(dirname $(dirname $(dirname "${0}")))))" source "$dir/teamcity-support.sh" # for 'tc_release_branch' -bazel build //pkg/cmd/bazci --config=ci +bazel build //pkg/cmd/bazci EXTRA_PARAMS="" @@ -21,6 +21,6 @@ if tc_bors_branch; then EXTRA_PARAMS=" --flaky_test_attempts=2" fi -$(bazel info bazel-bin --config=ci)/pkg/cmd/bazci/bazci_/bazci -- test --config=ci --config=use_ci_timeouts -c fastbuild \ +$(bazel info bazel-bin)/pkg/cmd/bazci/bazci_/bazci -- test --config=ci --config=use_ci_timeouts -c fastbuild \ //pkg:all_tests \ --profile=/artifacts/profile.gz $EXTRA_PARAMS diff --git a/build/teamcity/cockroach/ci/tests-aws-linux-arm64/acceptance.sh b/build/teamcity/cockroach/ci/tests-aws-linux-arm64/acceptance.sh index 2fdc497be8a2..e1ff10de4e1e 100755 --- a/build/teamcity/cockroach/ci/tests-aws-linux-arm64/acceptance.sh +++ b/build/teamcity/cockroach/ci/tests-aws-linux-arm64/acceptance.sh @@ -19,7 +19,7 @@ else fi tc_start_block "Build cockroach" -build_script='bazel build --config $1 --config ci //pkg/cmd/cockroach-short && cp $(bazel info bazel-bin --config $1 --config ci)/pkg/cmd/cockroach-short/cockroach-short_/cockroach-short /artifacts/cockroach && chmod a+w /artifacts/cockroach' +build_script='bazel build --config $1 //pkg/cmd/cockroach-short && cp $(bazel info bazel-bin --config $1)/pkg/cmd/cockroach-short/cockroach-short_/cockroach-short /artifacts/cockroach && chmod a+w /artifacts/cockroach' run_bazel /usr/bin/bash -c "$build_script" -- "$CROSSLINUX_CONFIG" tc_end_block "Build cockroach" @@ -29,8 +29,8 @@ mkdir -p "$ARTIFACTSDIR" tc_start_block "Run acceptance tests" status=0 -bazel build //pkg/cmd/bazci --config=ci -BAZCI=$(bazel info bazel-bin --config=ci)/pkg/cmd/bazci/bazci_/bazci +bazel build //pkg/cmd/bazci +BAZCI=$(bazel info bazel-bin)/pkg/cmd/bazci/bazci_/bazci $BAZCI --artifacts_dir=$PWD/artifacts -- \ test //pkg/acceptance:acceptance_test \ diff --git a/build/teamcity/cockroach/ci/tests-aws-linux-arm64/ui_test_impl.sh b/build/teamcity/cockroach/ci/tests-aws-linux-arm64/ui_test_impl.sh index e4d7a47c0067..28b0cae7edab 100755 --- a/build/teamcity/cockroach/ci/tests-aws-linux-arm64/ui_test_impl.sh +++ b/build/teamcity/cockroach/ci/tests-aws-linux-arm64/ui_test_impl.sh @@ -8,5 +8,5 @@ set -xeuo pipefail -bazel build //pkg/cmd/bazci --config=ci -$(bazel info bazel-bin --config=ci)/pkg/cmd/bazci/bazci_/bazci -- test --config=ci //pkg/ui:test +bazel build //pkg/cmd/bazci +$(bazel info bazel-bin)/pkg/cmd/bazci/bazci_/bazci -- test --config=ci //pkg/ui:test diff --git a/build/teamcity/cockroach/ci/tests/local_roachtest_impl.sh b/build/teamcity/cockroach/ci/tests/local_roachtest_impl.sh index 87885585f061..0b36613fa53a 100755 --- a/build/teamcity/cockroach/ci/tests/local_roachtest_impl.sh +++ b/build/teamcity/cockroach/ci/tests/local_roachtest_impl.sh @@ -14,14 +14,14 @@ else export CROSSLINUX_CONFIG="crosslinux" fi -BAZEL_BIN=$(bazel info bazel-bin --config=$CROSSLINUX_CONFIG --config=ci) +BAZEL_BIN=$(bazel info bazel-bin --config=$CROSSLINUX_CONFIG) -bazel build --config=$CROSSLINUX_CONFIG --config=ci //pkg/cmd/cockroach-short \ +bazel build --config=$CROSSLINUX_CONFIG //pkg/cmd/cockroach-short \ //pkg/cmd/roachtest \ //pkg/cmd/roachprod \ //pkg/cmd/workload -bazel build --config=$CROSSLINUX_CONFIG --config=ci --config=force_build_cdeps //c-deps:libgeos +bazel build --config=$CROSSLINUX_CONFIG --config=force_build_cdeps //c-deps:libgeos mkdir -p lib cp $BAZEL_BIN/c-deps/libgeos_foreign/lib/libgeos.so lib/libgeos.so diff --git a/build/teamcity/cockroach/ci/tests/maybe_stress_impl.sh b/build/teamcity/cockroach/ci/tests/maybe_stress_impl.sh index 0c3ee09cb256..de3ce42f933c 100755 --- a/build/teamcity/cockroach/ci/tests/maybe_stress_impl.sh +++ b/build/teamcity/cockroach/ci/tests/maybe_stress_impl.sh @@ -16,7 +16,7 @@ fi TARGET="$1" -bazel build //pkg/cmd/github-pull-request-make //pkg/cmd/bazci @com_github_cockroachdb_stress//:stress --config=ci -BAZEL_BIN=$(bazel info bazel-bin --config=ci) +bazel build //pkg/cmd/github-pull-request-make //pkg/cmd/bazci @com_github_cockroachdb_stress//:stress +BAZEL_BIN=$(bazel info bazel-bin) PATH=$PATH:$BAZEL_BIN/pkg/cmd/bazci/bazci_:$BAZEL_BIN/external/com_github_cockroachdb_stress/stress_ TARGET=$TARGET \ $BAZEL_BIN/pkg/cmd/github-pull-request-make/github-pull-request-make_/github-pull-request-make diff --git a/build/teamcity/cockroach/ci/tests/testrace_impl.sh b/build/teamcity/cockroach/ci/tests/testrace_impl.sh index fde5e4be7bda..af763fa9dab1 100755 --- a/build/teamcity/cockroach/ci/tests/testrace_impl.sh +++ b/build/teamcity/cockroach/ci/tests/testrace_impl.sh @@ -11,7 +11,7 @@ set -xeuo pipefail # Usage: testrace_impl.sh PKG1 [PKG2 PKG3 PKG4...] # packages are expected to be formatted as go-style, e.g. ./pkg/cmd/bazci. -bazel build //pkg/cmd/bazci --config=ci +bazel build //pkg/cmd/bazci size_to_timeout=("small:1200" "medium:6000" "large:18000" "enormous:72000") for pkg in "$@" do @@ -35,7 +35,7 @@ do echo "Skipping test $test" continue fi - $(bazel info bazel-bin --config=ci)/pkg/cmd/bazci/bazci_/bazci -- test --config=ci --config=race "$test" \ + $(bazel info bazel-bin)/pkg/cmd/bazci/bazci_/bazci -- test --config=ci --config=race "$test" \ --test_env=COCKROACH_LOGIC_TESTS_SKIP=true \ --test_timeout $timeout \ --test_sharding_strategy=disabled \ diff --git a/build/teamcity/cockroach/coverage/unit_tests_impl.sh b/build/teamcity/cockroach/coverage/unit_tests_impl.sh index e7209fbbc27c..a3a7741ccf67 100755 --- a/build/teamcity/cockroach/coverage/unit_tests_impl.sh +++ b/build/teamcity/cockroach/coverage/unit_tests_impl.sh @@ -8,9 +8,9 @@ set -xeuo pipefail -bazel build //pkg/cmd/bazci --config=ci +bazel build //pkg/cmd/bazci -$(bazel info bazel-bin --config=ci)/pkg/cmd/bazci/bazci_/bazci -- \ +$(bazel info bazel-bin)/pkg/cmd/bazci/bazci_/bazci -- \ coverage \ --config=ci --config=use_ci_timeouts -c fastbuild \ --@io_bazel_rules_go//go/config:cover_format=lcov --combined_report=lcov \ diff --git a/build/teamcity/cockroach/create-docs-issue.sh b/build/teamcity/cockroach/create-docs-issue.sh index c409badc9ec6..e5db541cd8d2 100755 --- a/build/teamcity/cockroach/create-docs-issue.sh +++ b/build/teamcity/cockroach/create-docs-issue.sh @@ -16,7 +16,7 @@ source "$dir/teamcity-support.sh" source "$dir/teamcity-bazel-support.sh" BAZEL_SUPPORT_EXTRA_DOCKER_ARGS="-e GITHUB_API_TOKEN -e JIRA_API_TOKEN -e DOCS_ISSUE_GEN_END_TIME -e DOCS_ISSUE_GEN_START_TIME -e DRY_RUN_DOCS_ISSUE_GEN" run_bazel << 'EOF' -bazel build --config ci //pkg/cmd/docs-issue-generation -BAZEL_BIN=$(bazel info bazel-bin --config ci) +bazel build //pkg/cmd/docs-issue-generation +BAZEL_BIN=$(bazel info bazel-bin) $BAZEL_BIN/pkg/cmd/docs-issue-generation/docs-issue-generation_/docs-issue-generation EOF diff --git a/build/teamcity/cockroach/nightlies/cloud_unit_tests_impl.sh b/build/teamcity/cockroach/nightlies/cloud_unit_tests_impl.sh index 8c8808431ad4..2f55b7b47f35 100755 --- a/build/teamcity/cockroach/nightlies/cloud_unit_tests_impl.sh +++ b/build/teamcity/cockroach/nightlies/cloud_unit_tests_impl.sh @@ -11,8 +11,8 @@ set -xeuo pipefail dir="$(dirname $(dirname $(dirname $(dirname "${0}"))))" source "$dir/teamcity-support.sh" # For log_into_gcloud -bazel build //pkg/cmd/bazci --config=ci -BAZEL_BIN=$(bazel info bazel-bin --config=ci) +bazel build //pkg/cmd/bazci +BAZEL_BIN=$(bazel info bazel-bin) ARTIFACTS_DIR=/artifacts diff --git a/build/teamcity/cockroach/nightlies/compose.sh b/build/teamcity/cockroach/nightlies/compose.sh index 7d54719a9890..77be36033444 100755 --- a/build/teamcity/cockroach/nightlies/compose.sh +++ b/build/teamcity/cockroach/nightlies/compose.sh @@ -14,15 +14,15 @@ source "$dir/teamcity-bazel-support.sh" tc_start_block "Run compose tests" -bazel build //pkg/cmd/bazci --config=ci -BAZEL_BIN=$(bazel info bazel-bin --config=ci) +bazel build //pkg/cmd/bazci +BAZEL_BIN=$(bazel info bazel-bin) BAZCI=$BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci -bazel build //pkg/cmd/cockroach //pkg/compose/compare/compare:compare_test //c-deps:libgeos --config=ci --config=crosslinux --config=test -CROSSBIN=$(bazel info bazel-bin --config=ci --config=crosslinux --config=test) +bazel build //pkg/cmd/cockroach //pkg/compose/compare/compare:compare_test //c-deps:libgeos --config=crosslinux --config=test +CROSSBIN=$(bazel info bazel-bin --config=crosslinux --config=test) COCKROACH=$CROSSBIN/pkg/cmd/cockroach/cockroach_/cockroach COMPAREBIN=$CROSSBIN/pkg/compose/compare/compare/compare_test_/compare_test -LIBGEOSDIR=$(bazel info execution_root --config=crosslinux --config=ci --config=test)/external/archived_cdep_libgeos_linux/lib/ +LIBGEOSDIR=$(bazel info execution_root --config=crosslinux --config=test)/external/archived_cdep_libgeos_linux/lib/ ARTIFACTS_DIR=$PWD/artifacts mkdir -p $ARTIFACTS_DIR diff --git a/build/teamcity/cockroach/nightlies/lint_urls_impl.sh b/build/teamcity/cockroach/nightlies/lint_urls_impl.sh index aac673307370..cd956b40c1bb 100755 --- a/build/teamcity/cockroach/nightlies/lint_urls_impl.sh +++ b/build/teamcity/cockroach/nightlies/lint_urls_impl.sh @@ -18,8 +18,8 @@ bazel run //pkg/gen:code bazel run //pkg/cmd/generate-cgo:generate-cgo --run_under="cd $root && " # generated files requirements -- end -bazel build //pkg/cmd/bazci --config=ci -$(bazel info bazel-bin --config=ci)/pkg/cmd/bazci/bazci_/bazci -- \ +bazel build //pkg/cmd/bazci +$(bazel info bazel-bin)/pkg/cmd/bazci/bazci_/bazci -- \ test //pkg/testutils/lint:lint_test \ --config=ci --define gotags=bazel,gss,nightly,lint \ --test_filter=TestNightlyLint \ diff --git a/build/teamcity/cockroach/nightlies/microbenchmark_build_support.sh b/build/teamcity/cockroach/nightlies/microbenchmark_build_support.sh index 59fd1bf7c505..78b38f88e3ca 100755 --- a/build/teamcity/cockroach/nightlies/microbenchmark_build_support.sh +++ b/build/teamcity/cockroach/nightlies/microbenchmark_build_support.sh @@ -24,7 +24,7 @@ function build_and_upload_binaries() { return fi - config_args="--config=crosslinux --config=ci --crdb_test_off" + config_args="--config=crosslinux --crdb_test_off" bazel clean go_test_targets=$(bazel query kind\(go_test, //$BENCH_PACKAGE:all\)) bazel build $config_args $go_test_targets diff --git a/build/teamcity/cockroach/nightlies/microbenchmark_weekly.sh b/build/teamcity/cockroach/nightlies/microbenchmark_weekly.sh index 99eb681ce0d2..037316bc5c08 100755 --- a/build/teamcity/cockroach/nightlies/microbenchmark_weekly.sh +++ b/build/teamcity/cockroach/nightlies/microbenchmark_weekly.sh @@ -58,8 +58,8 @@ export SANITIZED_BENCH_PACKAGE=${SANITIZED_BENCH_PACKAGE/.../all} # Build rochprod and roachprod-microbench run_bazel <<'EOF' -bazel build --config ci --config crosslinux //pkg/cmd/roachprod //pkg/cmd/roachprod-microbench -BAZEL_BIN=$(bazel info bazel-bin --config ci --config crosslinux) +bazel build --config crosslinux //pkg/cmd/roachprod //pkg/cmd/roachprod-microbench +BAZEL_BIN=$(bazel info bazel-bin --config crosslinux) mkdir -p bin cp $BAZEL_BIN/pkg/cmd/roachprod/roachprod_/roachprod bin cp $BAZEL_BIN/pkg/cmd/roachprod-microbench/roachprod-microbench_/roachprod-microbench bin diff --git a/build/teamcity/cockroach/nightlies/optimizer_tests_impl.sh b/build/teamcity/cockroach/nightlies/optimizer_tests_impl.sh index 879073e47870..7ea12f2f0afc 100755 --- a/build/teamcity/cockroach/nightlies/optimizer_tests_impl.sh +++ b/build/teamcity/cockroach/nightlies/optimizer_tests_impl.sh @@ -11,8 +11,8 @@ set -xeuo pipefail dir="$(dirname $(dirname $(dirname $(dirname "${0}"))))" source "$dir/teamcity/util.sh" -bazel build //pkg/cmd/bazci --config=ci -BAZEL_BIN=$(bazel info bazel-bin --config=ci) +bazel build //pkg/cmd/bazci +BAZEL_BIN=$(bazel info bazel-bin) tc_start_block "Run opt tests with fast_int_set_large" ARTIFACTS_DIR=/artifacts/fast_int_set_large diff --git a/build/teamcity/cockroach/nightlies/pebble_nightly_build_test_binary.sh b/build/teamcity/cockroach/nightlies/pebble_nightly_build_test_binary.sh index cbc1fcdf3a05..81139d2b5b56 100755 --- a/build/teamcity/cockroach/nightlies/pebble_nightly_build_test_binary.sh +++ b/build/teamcity/cockroach/nightlies/pebble_nightly_build_test_binary.sh @@ -25,7 +25,7 @@ RESTORE_COMMIT=$(git rev-parse HEAD) git fetch origin "$CRDB_BRANCH" git checkout "origin/$CRDB_BRANCH" -BAZEL_BIN=$(bazel info bazel-bin --config ci) +BAZEL_BIN=$(bazel info bazel-bin) bazel run @go_sdk//:bin/go get "github.com/cockroachdb/pebble@$PEBBLE_BRANCH" diff --git a/build/teamcity/cockroach/nightlies/pebble_nightly_common.sh b/build/teamcity/cockroach/nightlies/pebble_nightly_common.sh index cfd956aa1e16..3bbd384b210a 100755 --- a/build/teamcity/cockroach/nightlies/pebble_nightly_common.sh +++ b/build/teamcity/cockroach/nightlies/pebble_nightly_common.sh @@ -33,8 +33,8 @@ mkdir -p "$PWD/bin" chmod o+rwx "$PWD/bin" # Build the roachtest binary. -bazel build //pkg/cmd/roachtest --config ci -c opt -BAZEL_BIN=$(bazel info bazel-bin --config ci -c opt) +bazel build //pkg/cmd/roachtest -c opt +BAZEL_BIN=$(bazel info bazel-bin -c opt) cp $BAZEL_BIN/pkg/cmd/roachtest/roachtest_/roachtest bin chmod a+w bin/roachtest @@ -45,8 +45,8 @@ chmod a+w bin/roachtest bazel run @go_sdk//:bin/go get github.com/cockroachdb/pebble@master NEW_DEPS_BZL_CONTENT=$(bazel run //pkg/cmd/mirror/go:mirror) echo "$NEW_DEPS_BZL_CONTENT" > DEPS.bzl -bazel build @com_github_cockroachdb_pebble//cmd/pebble --config ci -c opt -BAZEL_BIN=$(bazel info bazel-bin --config ci -c opt) +bazel build @com_github_cockroachdb_pebble//cmd/pebble -c opt +BAZEL_BIN=$(bazel info bazel-bin -c opt) cp $BAZEL_BIN/external/com_github_cockroachdb_pebble/cmd/pebble/pebble_/pebble ./pebble.linux chmod a+w ./pebble.linux @@ -73,8 +73,8 @@ function prepare_datadir() { # Build the mkbench tool from within the Pebble repo. This is used to parse # the benchmark data. function build_mkbench() { - bazel build @com_github_cockroachdb_pebble//internal/mkbench --config ci -c opt - BAZEL_BIN=$(bazel info bazel-bin --config ci -c opt) + bazel build @com_github_cockroachdb_pebble//internal/mkbench -c opt + BAZEL_BIN=$(bazel info bazel-bin -c opt) cp $BAZEL_BIN/external/com_github_cockroachdb_pebble/internal/mkbench/mkbench_/mkbench . chmod a+w mkbench } diff --git a/build/teamcity/cockroach/nightlies/pebble_nightly_metamorphic_crossversion_impl.sh b/build/teamcity/cockroach/nightlies/pebble_nightly_metamorphic_crossversion_impl.sh index d941d0300710..8d40e7617386 100755 --- a/build/teamcity/cockroach/nightlies/pebble_nightly_metamorphic_crossversion_impl.sh +++ b/build/teamcity/cockroach/nightlies/pebble_nightly_metamorphic_crossversion_impl.sh @@ -18,9 +18,9 @@ ls -l "/test-bin" echo "TC_SERVER_URL is $TC_SERVER_URL" -bazel build //pkg/cmd/bazci --config=ci +bazel build //pkg/cmd/bazci -BAZEL_BIN=$(bazel info bazel-bin --config ci) +BAZEL_BIN=$(bazel info bazel-bin) # The script accepts the arguments accepted by TestMetaCrossVersion. It should # look like: diff --git a/build/teamcity/cockroach/nightlies/pebble_nightly_metamorphic_impl.sh b/build/teamcity/cockroach/nightlies/pebble_nightly_metamorphic_impl.sh index d689344928f9..fcfee6ae00ae 100755 --- a/build/teamcity/cockroach/nightlies/pebble_nightly_metamorphic_impl.sh +++ b/build/teamcity/cockroach/nightlies/pebble_nightly_metamorphic_impl.sh @@ -14,9 +14,9 @@ mkdir -p $ARTIFACTS_DIR echo "TC_SERVER_URL is $TC_SERVER_URL" -bazel build //pkg/cmd/bazci --config=ci +bazel build //pkg/cmd/bazci -BAZEL_BIN=$(bazel info bazel-bin --config ci) +BAZEL_BIN=$(bazel info bazel-bin) exit_status=0 # NB: If adjusting the metamorphic test flags below, be sure to also update diff --git a/build/teamcity/cockroach/nightlies/pebble_nightly_metamorphic_race_impl.sh b/build/teamcity/cockroach/nightlies/pebble_nightly_metamorphic_race_impl.sh index 0e3412f0bc78..fb97d522a2a9 100755 --- a/build/teamcity/cockroach/nightlies/pebble_nightly_metamorphic_race_impl.sh +++ b/build/teamcity/cockroach/nightlies/pebble_nightly_metamorphic_race_impl.sh @@ -14,9 +14,9 @@ mkdir -p $ARTIFACTS_DIR echo "TC_SERVER_URL is $TC_SERVER_URL" -bazel build //pkg/cmd/bazci --config=ci +bazel build //pkg/cmd/bazci -BAZEL_BIN=$(bazel info bazel-bin --config ci) +BAZEL_BIN=$(bazel info bazel-bin) exit_status=0 # NB: If adjusting the metamorphic test flags below, be sure to also update diff --git a/build/teamcity/cockroach/nightlies/pebble_nightly_metamorphic_two_instance_impl.sh b/build/teamcity/cockroach/nightlies/pebble_nightly_metamorphic_two_instance_impl.sh index 494948ab3280..aa2b331bc372 100755 --- a/build/teamcity/cockroach/nightlies/pebble_nightly_metamorphic_two_instance_impl.sh +++ b/build/teamcity/cockroach/nightlies/pebble_nightly_metamorphic_two_instance_impl.sh @@ -14,9 +14,9 @@ mkdir -p $ARTIFACTS_DIR echo "TC_SERVER_URL is $TC_SERVER_URL" -bazel build //pkg/cmd/bazci --config=ci +bazel build //pkg/cmd/bazci -BAZEL_BIN=$(bazel info bazel-bin --config ci) +BAZEL_BIN=$(bazel info bazel-bin) exit_status=0 # NB: If adjusting the metamorphic test flags below, be sure to also update diff --git a/build/teamcity/cockroach/nightlies/pebble_nightly_race_common.sh b/build/teamcity/cockroach/nightlies/pebble_nightly_race_common.sh index ab23fb324e8f..00fd3201153b 100755 --- a/build/teamcity/cockroach/nightlies/pebble_nightly_race_common.sh +++ b/build/teamcity/cockroach/nightlies/pebble_nightly_race_common.sh @@ -33,8 +33,8 @@ mkdir -p "$PWD/bin" chmod o+rwx "$PWD/bin" # Build the roachtest binary. -bazel build //pkg/cmd/roachtest --config ci -c opt -BAZEL_BIN=$(bazel info bazel-bin --config ci -c opt) +bazel build //pkg/cmd/roachtest -c opt +BAZEL_BIN=$(bazel info bazel-bin -c opt) cp $BAZEL_BIN/pkg/cmd/roachtest/roachtest_/roachtest bin chmod a+w bin/roachtest @@ -45,8 +45,8 @@ chmod a+w bin/roachtest bazel run @go_sdk//:bin/go get github.com/cockroachdb/pebble@master NEW_DEPS_BZL_CONTENT=$(bazel run //pkg/cmd/mirror/go:mirror) echo "$NEW_DEPS_BZL_CONTENT" > DEPS.bzl -bazel build @com_github_cockroachdb_pebble//cmd/pebble --config race --config ci -c opt -BAZEL_BIN=$(bazel info bazel-bin --config race --config ci -c opt) +bazel build @com_github_cockroachdb_pebble//cmd/pebble --config race -c opt +BAZEL_BIN=$(bazel info bazel-bin --config race -c opt) cp $BAZEL_BIN/external/com_github_cockroachdb_pebble/cmd/pebble/pebble_/pebble ./pebble.linux chmod a+w ./pebble.linux diff --git a/build/teamcity/cockroach/nightlies/random_syntax_tests_impl.sh b/build/teamcity/cockroach/nightlies/random_syntax_tests_impl.sh index b7622efd26bb..eeac27c68048 100755 --- a/build/teamcity/cockroach/nightlies/random_syntax_tests_impl.sh +++ b/build/teamcity/cockroach/nightlies/random_syntax_tests_impl.sh @@ -10,8 +10,8 @@ set -xeuo pipefail dir="$(dirname $(dirname $(dirname $(dirname "${0}"))))" -bazel build //pkg/cmd/bazci --config=ci -BAZEL_BIN=$(bazel info bazel-bin --config=ci) +bazel build //pkg/cmd/bazci +BAZEL_BIN=$(bazel info bazel-bin) exit_status=0 $BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci -- test --config=ci \ //pkg/sql/tests:tests_test \ diff --git a/build/teamcity/cockroach/nightlies/roachtest_compile_component.sh b/build/teamcity/cockroach/nightlies/roachtest_compile_component.sh index 2a56f6ce4542..2d1eca9d0fca 100755 --- a/build/teamcity/cockroach/nightlies/roachtest_compile_component.sh +++ b/build/teamcity/cockroach/nightlies/roachtest_compile_component.sh @@ -66,17 +66,17 @@ artifacts=() case "$component" in cockroach) # Cockroach binary. - bazel_args=(--config force_build_cdeps //pkg/cmd/cockroach $crdb_extra_flags) + bazel_args=(--config force_build_cdeps --norun_validations //pkg/cmd/cockroach $crdb_extra_flags) artifacts=("pkg/cmd/cockroach/cockroach_/cockroach:bin/cockroach.$os-$arch") ;; cockroach-ea) # Cockroach binary with enabled assertions (EA). - bazel_args=(--config force_build_cdeps //pkg/cmd/cockroach --crdb_test $crdb_extra_flags) + bazel_args=(--config force_build_cdeps --norun_validations //pkg/cmd/cockroach --crdb_test $crdb_extra_flags) artifacts=("pkg/cmd/cockroach/cockroach_/cockroach:bin/cockroach-ea.$os-$arch") ;; workload) # Workload binary. - bazel_args=(--config force_build_cdeps //pkg/cmd/workload) + bazel_args=(--config force_build_cdeps --norun_validations //pkg/cmd/workload) artifacts=("pkg/cmd/workload/workload_/workload:bin/workload.$os-$arch") ;; libgeos) @@ -116,8 +116,8 @@ esac echo "Building $os/$arch/$component..." -bazel build --config $config --config ci -c opt "${bazel_args[@]}" -BAZEL_BIN=$(bazel info bazel-bin --config $config --config ci -c opt) +bazel build --config $config -c opt "${bazel_args[@]}" +BAZEL_BIN=$(bazel info bazel-bin --config $config -c opt) for artifact in "${artifacts[@]}"; do src=${artifact%%:*} dst=${artifact#*:} diff --git a/build/teamcity/cockroach/nightlies/schema_changer_comparator_nightly_impl.sh b/build/teamcity/cockroach/nightlies/schema_changer_comparator_nightly_impl.sh index e9c4178d619b..92ab97421430 100755 --- a/build/teamcity/cockroach/nightlies/schema_changer_comparator_nightly_impl.sh +++ b/build/teamcity/cockroach/nightlies/schema_changer_comparator_nightly_impl.sh @@ -14,8 +14,8 @@ source "$dir/teamcity-support.sh" exit_status=0 -bazel build //pkg/cmd/bazci --config=ci -BAZEL_BIN=$(bazel info bazel-bin --config=ci) +bazel build //pkg/cmd/bazci +BAZEL_BIN=$(bazel info bazel-bin) # Run schema changer comparator test. $BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci test -- --config=ci \ diff --git a/build/teamcity/cockroach/nightlies/sqlite_logic_test_impl.sh b/build/teamcity/cockroach/nightlies/sqlite_logic_test_impl.sh index f0babbdfe0f3..4671e725ae15 100755 --- a/build/teamcity/cockroach/nightlies/sqlite_logic_test_impl.sh +++ b/build/teamcity/cockroach/nightlies/sqlite_logic_test_impl.sh @@ -10,8 +10,8 @@ set -xeuo pipefail dir="$(dirname $(dirname $(dirname $(dirname "${0}"))))" -bazel build //pkg/cmd/bazci --config=ci -BAZEL_BIN=$(bazel info bazel-bin --config=ci) +bazel build //pkg/cmd/bazci +BAZEL_BIN=$(bazel info bazel-bin) exit_status=0 $BAZEL_BIN/pkg/cmd/bazci/bazci_/bazci -- test --config=ci \ //pkg/sql/sqlitelogictest/tests/... \ diff --git a/build/teamcity/cockroach/nightlies/sqllogic_backup_restore_impl.sh b/build/teamcity/cockroach/nightlies/sqllogic_backup_restore_impl.sh index 751a40c93277..248a027e62f5 100755 --- a/build/teamcity/cockroach/nightlies/sqllogic_backup_restore_impl.sh +++ b/build/teamcity/cockroach/nightlies/sqllogic_backup_restore_impl.sh @@ -12,8 +12,8 @@ dir="$(dirname $(dirname $(dirname $(dirname "${0}"))))" source "$dir/teamcity-bazel-support.sh" # For process_test_json source "$dir/teamcity-support.sh" -bazel build //pkg/cmd/bazci --config=ci -BAZEL_BIN=$(bazel info bazel-bin --config=ci) +bazel build //pkg/cmd/bazci +BAZEL_BIN=$(bazel info bazel-bin) google_credentials="$GOOGLE_EPHEMERAL_CREDENTIALS" log_into_gcloud diff --git a/build/teamcity/cockroach/nightlies/sqllogic_corpus_nightly_impl.sh b/build/teamcity/cockroach/nightlies/sqllogic_corpus_nightly_impl.sh index 30544f431791..629ad8726e4c 100755 --- a/build/teamcity/cockroach/nightlies/sqllogic_corpus_nightly_impl.sh +++ b/build/teamcity/cockroach/nightlies/sqllogic_corpus_nightly_impl.sh @@ -11,8 +11,8 @@ set -xeuo pipefail dir="$(dirname $(dirname $(dirname $(dirname "${0}"))))" source "$dir/teamcity-support.sh" -bazel build //pkg/cmd/bazci --config=ci -BAZEL_BIN=$(bazel info bazel-bin --config=ci) +bazel build //pkg/cmd/bazci +BAZEL_BIN=$(bazel info bazel-bin) google_credentials="$GOOGLE_EPHEMERAL_CREDENTIALS" log_into_gcloud diff --git a/build/teamcity/cockroach/nightlies/sqllogic_hi_vmodule_nightly_impl.sh b/build/teamcity/cockroach/nightlies/sqllogic_hi_vmodule_nightly_impl.sh index af5cc9bd94a5..3f6b6bfd261e 100755 --- a/build/teamcity/cockroach/nightlies/sqllogic_hi_vmodule_nightly_impl.sh +++ b/build/teamcity/cockroach/nightlies/sqllogic_hi_vmodule_nightly_impl.sh @@ -10,8 +10,8 @@ set -xeuo pipefail dir="$(dirname $(dirname $(dirname $(dirname "${0}"))))" -bazel build //pkg/cmd/bazci --config=ci -BAZEL_BIN=$(bazel info bazel-bin --config=ci) +bazel build //pkg/cmd/bazci +BAZEL_BIN=$(bazel info bazel-bin) ARTIFACTS_DIR=/artifacts diff --git a/build/teamcity/cockroach/nightlies/stress_impl.sh b/build/teamcity/cockroach/nightlies/stress_impl.sh index 4be6f1c70355..edb4ffae6dc2 100755 --- a/build/teamcity/cockroach/nightlies/stress_impl.sh +++ b/build/teamcity/cockroach/nightlies/stress_impl.sh @@ -25,8 +25,8 @@ else echo "Confirmed that git branch is $GIT_BRANCH matches build branch $TC_BUILD_BRANCH" fi -bazel build //pkg/cmd/bazci --config=ci -BAZEL_BIN=$(bazel info bazel-bin --config=ci) +bazel build //pkg/cmd/bazci +BAZEL_BIN=$(bazel info bazel-bin) ARTIFACTS_DIR=/artifacts if [[ ! -z $(bazel query "attr(tags, \"integration\", $TARGET)") ]] diff --git a/build/teamcity/cockroach/nightlies/url_check_impl.sh b/build/teamcity/cockroach/nightlies/url_check_impl.sh index d81a99810131..9d26a45dc032 100755 --- a/build/teamcity/cockroach/nightlies/url_check_impl.sh +++ b/build/teamcity/cockroach/nightlies/url_check_impl.sh @@ -8,4 +8,4 @@ set -xeuo pipefail -bazel run //pkg/cmd/urlcheck --config=ci --run_under="cd $PWD && " +bazel run //pkg/cmd/urlcheck --run_under="cd $PWD && " diff --git a/build/teamcity/cockroach/post-merge/publish-bleeding-edge-per-platform.sh b/build/teamcity/cockroach/post-merge/publish-bleeding-edge-per-platform.sh index 7eeb8ca872b2..717772d8743b 100755 --- a/build/teamcity/cockroach/post-merge/publish-bleeding-edge-per-platform.sh +++ b/build/teamcity/cockroach/post-merge/publish-bleeding-edge-per-platform.sh @@ -21,8 +21,8 @@ export gcs_credentials="$GCS_CREDENTIALS_PROD" platform="${PLATFORM:?PLATFORM must be specified}" BAZEL_SUPPORT_EXTRA_DOCKER_ARGS="-e TC_BUILDTYPE_ID -e TC_BUILD_BRANCH -e gcs_credentials -e gcs_bucket=$gcs_bucket -e platform=$platform" run_bazel << 'EOF' -bazel build --config ci //pkg/cmd/publish-artifacts -BAZEL_BIN=$(bazel info bazel-bin --config ci) +bazel build //pkg/cmd/publish-artifacts +BAZEL_BIN=$(bazel info bazel-bin) export google_credentials="$gcs_credentials" source "build/teamcity-support.sh" # For log_into_gcloud log_into_gcloud diff --git a/build/teamcity/cockroach/publish-sql-grammar-diagrams-impl.sh b/build/teamcity/cockroach/publish-sql-grammar-diagrams-impl.sh index 842733ff47b6..fc92fe652414 100755 --- a/build/teamcity/cockroach/publish-sql-grammar-diagrams-impl.sh +++ b/build/teamcity/cockroach/publish-sql-grammar-diagrams-impl.sh @@ -8,6 +8,6 @@ set -xeuo pipefail -bazel build //pkg/cmd/bazci --config=ci -$(bazel info bazel-bin --config=ci)/pkg/cmd/bazci/bazci_/bazci -- build --config ci \ - //docs/generated/sql/bnf //docs/generated/sql/bnf:svg +bazel build //pkg/cmd/bazci +$(bazel info bazel-bin)/pkg/cmd/bazci/bazci_/bazci -- build \ + //docs/generated/sql/bnf //docs/generated/sql/bnf:svg diff --git a/build/teamcity/internal/cockroach/build/ci/generate-profile-impl.sh b/build/teamcity/internal/cockroach/build/ci/generate-profile-impl.sh index 19f1e4710271..4853c7b05491 100755 --- a/build/teamcity/internal/cockroach/build/ci/generate-profile-impl.sh +++ b/build/teamcity/internal/cockroach/build/ci/generate-profile-impl.sh @@ -20,7 +20,7 @@ log_into_gcloud filename=$(date +"%Y%m%d%H%M%S").pprof -bazel build --config ci //pkg/cmd/run-pgo-build +bazel build //pkg/cmd/run-pgo-build _bazel/bin/pkg/cmd/run-pgo-build/run-pgo-build_/run-pgo-build -out "$filename" shasum -a 256 "$filename" diff --git a/build/teamcity/internal/release/process/build-cockroach-release-per-platform.sh b/build/teamcity/internal/release/process/build-cockroach-release-per-platform.sh index 3ec9ae338d77..bd34c16728cf 100755 --- a/build/teamcity/internal/release/process/build-cockroach-release-per-platform.sh +++ b/build/teamcity/internal/release/process/build-cockroach-release-per-platform.sh @@ -48,8 +48,8 @@ tc_start_block "Make and publish release artifacts" # Using publish-provisional-artifacts here is funky. We're directly publishing # the official binaries, not provisional ones. Legacy naming. To clean up... BAZEL_SUPPORT_EXTRA_DOCKER_ARGS="-e TC_BUILDTYPE_ID -e TC_BUILD_BRANCH=$version -e gcs_credentials -e gcs_bucket=$gcs_bucket -e platform=$platform" run_bazel << 'EOF' -bazel build --config ci //pkg/cmd/publish-provisional-artifacts -BAZEL_BIN=$(bazel info bazel-bin --config ci) +bazel build //pkg/cmd/publish-provisional-artifacts +BAZEL_BIN=$(bazel info bazel-bin) export google_credentials="$gcs_credentials" source "build/teamcity-support.sh" # For log_into_gcloud log_into_gcloud diff --git a/build/teamcity/internal/release/process/check-gha.sh b/build/teamcity/internal/release/process/check-gha.sh index d48728b02ff6..2edef6842701 100755 --- a/build/teamcity/internal/release/process/check-gha.sh +++ b/build/teamcity/internal/release/process/check-gha.sh @@ -13,8 +13,8 @@ source "$dir/release/teamcity-support.sh" source "$dir/teamcity-bazel-support.sh" # for run_bazel BAZEL_SUPPORT_EXTRA_DOCKER_ARGS="-e sha=$BUILD_VCS_NUMBER" run_bazel << 'EOF' -bazel build --config ci //pkg/cmd/github-action-poller -BAZEL_BIN=$(bazel info bazel-bin --config ci) +bazel build //pkg/cmd/github-action-poller +BAZEL_BIN=$(bazel info bazel-bin) $BAZEL_BIN/pkg/cmd/github-action-poller/github-action-poller_/github-action-poller \ --owner cockroachdb \ --repo cockroach \ diff --git a/build/teamcity/internal/release/process/make-and-publish-build-artifacts-per-platform.sh b/build/teamcity/internal/release/process/make-and-publish-build-artifacts-per-platform.sh index 121308215b2c..050a68c6180e 100755 --- a/build/teamcity/internal/release/process/make-and-publish-build-artifacts-per-platform.sh +++ b/build/teamcity/internal/release/process/make-and-publish-build-artifacts-per-platform.sh @@ -71,8 +71,8 @@ tc_end_block "Tag the release" tc_start_block "Compile and publish artifacts" BAZEL_SUPPORT_EXTRA_DOCKER_ARGS="-e TC_BUILDTYPE_ID -e TC_BUILD_BRANCH=$build_name -e build_name=$build_name -e gcs_credentials -e gcs_bucket=$gcs_bucket -e platform=$platform" run_bazel << 'EOF' -bazel build --config ci //pkg/cmd/publish-provisional-artifacts -BAZEL_BIN=$(bazel info bazel-bin --config ci) +bazel build //pkg/cmd/publish-provisional-artifacts +BAZEL_BIN=$(bazel info bazel-bin) export google_credentials="$gcs_credentials" source "build/teamcity-support.sh" # For log_into_gcloud log_into_gcloud diff --git a/build/teamcity/internal/release/process/roachtest-release-qualification.sh b/build/teamcity/internal/release/process/roachtest-release-qualification.sh index d49934d3914e..86260c3fe4ce 100755 --- a/build/teamcity/internal/release/process/roachtest-release-qualification.sh +++ b/build/teamcity/internal/release/process/roachtest-release-qualification.sh @@ -43,8 +43,8 @@ curl -f -s -S -o- "https://storage.googleapis.com/cockroach-builds-artifacts-pro chmod +x cockroach run_bazel <<'EOF' -bazel build --config ci --config crosslinux //pkg/cmd/workload //pkg/cmd/roachtest //pkg/cmd/roachprod -BAZEL_BIN=$(bazel info bazel-bin --config ci --config crosslinux) +bazel build --config crosslinux //pkg/cmd/workload //pkg/cmd/roachtest //pkg/cmd/roachprod +BAZEL_BIN=$(bazel info bazel-bin --config crosslinux) mkdir -p bin cp $BAZEL_BIN/pkg/cmd/roachprod/roachprod_/roachprod bin cp $BAZEL_BIN/pkg/cmd/roachtest/roachtest_/roachtest bin diff --git a/c-deps/buildcdeps.sh b/c-deps/buildcdeps.sh index 17bf7970f489..de94e4dc7779 100755 --- a/c-deps/buildcdeps.sh +++ b/c-deps/buildcdeps.sh @@ -19,8 +19,8 @@ for CONFIG in $CONFIGS; do TARGETS="$TARGETS libkrb5" fi bazel clean - bazel build --config ci --config cross$CONFIG --//build/toolchains:prebuild_cdeps_flag $(echo "$TARGETS" | python3 -c 'import sys; input = sys.stdin.read().strip(); print(" ".join("//c-deps:{}_foreign".format(w) for w in input.split(" ")))') - BAZEL_BIN=$(bazel info bazel-bin --config ci --config cross$CONFIG) + bazel build --config cross$CONFIG --//build/toolchains:prebuild_cdeps_flag $(echo "$TARGETS" | python3 -c 'import sys; input = sys.stdin.read().strip(); print(" ".join("//c-deps:{}_foreign".format(w) for w in input.split(" ")))') + BAZEL_BIN=$(bazel info bazel-bin --config cross$CONFIG) for TARGET in $TARGETS; do # verify jemalloc was configured without madv_free if [[ $TARGET == libjemalloc ]]; then diff --git a/pkg/cmd/bazci/bazci.go b/pkg/cmd/bazci/bazci.go index 8c41e879277a..a2b56689afb5 100644 --- a/pkg/cmd/bazci/bazci.go +++ b/pkg/cmd/bazci/bazci.go @@ -342,17 +342,20 @@ func bazciImpl(cmd *cobra.Command, args []string) error { } args = append(args, fmt.Sprintf("--build_event_binary_file=%s", bepLoc)) args = append(args, fmt.Sprintf("--bes_backend=grpc://127.0.0.1:%d", port)) - // Insert `--config ci` if it's not already in the args list. - hasCiConfig := false - for idx, arg := range args { - if arg == "--config=ci" || arg == "--config=cinolint" || - (arg == "--config" && idx < len(args)-1 && (args[idx+1] == "ci" || args[idx+1] == "cinolint")) { - hasCiConfig = true - break + // Insert `--config=ci` if it's not already in the args list, + // specifically for tests. + if args[0] == testSubcmd || args[0] == coverageSubcmd { + hasCiConfig := false + for idx, arg := range args { + if arg == "--config=ci" || arg == "--config=cinolint" || + (arg == "--config" && idx < len(args)-1 && (args[idx+1] == "ci" || args[idx+1] == "cinolint")) { + hasCiConfig = true + break + } + } + if !hasCiConfig { + args = append(args, "--config", "ci") } - } - if !hasCiConfig { - args = append(args, "--config", "ci") } fmt.Println("running bazel w/ args: ", shellescape.QuoteCommand(args)) bazelCmd := exec.Command("bazel", args...) diff --git a/pkg/cmd/publish-artifacts/main_test.go b/pkg/cmd/publish-artifacts/main_test.go index 309ddec6a0f6..bb0798d8bd88 100644 --- a/pkg/cmd/publish-artifacts/main_test.go +++ b/pkg/cmd/publish-artifacts/main_test.go @@ -158,128 +158,128 @@ func TestPublish(t *testing.T) { }, expectedCmds: []string{ "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosslinuxbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64 version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64", - "env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxbase --config=ci", - "env=[] args=bazel info bazel-bin -c opt --config=crosslinuxbase --config=ci", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=crosslinuxbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=force_build_cdeps --config=crosslinuxfipsbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosslinuxfipsbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64-fips version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64-fips", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64-fips", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", - "env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxarmbase --config=ci", - "env=[] args=bazel info bazel-bin -c opt --config=crosslinuxarmbase --config=ci", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -c opt --config=force_build_cdeps --config=crosslinuxarmbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosslinuxarmbase", + "env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxarmbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=crosslinuxarmbase", "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql --enable_runfiles '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' -c opt --config=force_build_cdeps --config=crossmacosbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crossmacosbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=force_build_cdeps --config=crossmacosarmbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crossmacosarmbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql --enable_runfiles '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' -c opt --config=force_build_cdeps --config=crosswindowsbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosswindowsbase", }, expectedPuts: []string{ "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "-c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach.linux-gnu-amd64.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "-c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.linux-gnu-amd64.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64.1234567890abcdef.so CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "-c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.linux-gnu-amd64.1234567890abcdef.so", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64.1234567890abcdef.so CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "-c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.linux-gnu-amd64.1234567890abcdef.so", - "gs://edge-binaries-bucket/cockroach/workload.1234567890abcdef CONTENTS env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxbase --config=ci", + "gs://edge-binaries-bucket/cockroach/workload.1234567890abcdef CONTENTS env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxbase --norun_validations", "gs://edge-binaries-bucket/cockroach/workload.LATEST/no-cache REDIRECT /cockroach/workload.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64-fips.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "-c opt --config=force_build_cdeps --config=crosslinuxfipsbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64-fips.LATEST/no-cache REDIRECT /cockroach/cockroach.linux-gnu-amd64-fips.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64-fips.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "-c opt --config=force_build_cdeps --config=crosslinuxfipsbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64-fips.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.linux-gnu-amd64-fips.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64-fips.1234567890abcdef.so CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "-c opt --config=force_build_cdeps --config=crosslinuxfipsbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64-fips.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.linux-gnu-amd64-fips.1234567890abcdef.so", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64-fips.1234567890abcdef.so CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "-c opt --config=force_build_cdeps --config=crosslinuxfipsbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64-fips.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.linux-gnu-amd64-fips.1234567890abcdef.so", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-arm64.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", + "-c opt --config=force_build_cdeps --config=crosslinuxarmbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-arm64.LATEST/no-cache REDIRECT /cockroach/cockroach.linux-gnu-arm64.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-arm64.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", + "-c opt --config=force_build_cdeps --config=crosslinuxarmbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-arm64.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.linux-gnu-arm64.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-arm64.1234567890abcdef.so CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", + "-c opt --config=force_build_cdeps --config=crosslinuxarmbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-arm64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.linux-gnu-arm64.1234567890abcdef.so", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-arm64.1234567890abcdef.so CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", + "-c opt --config=force_build_cdeps --config=crosslinuxarmbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-arm64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.linux-gnu-arm64.1234567890abcdef.so", - "gs://edge-binaries-bucket/cockroach/workload.linux-gnu-arm64.1234567890abcdef CONTENTS env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxarmbase --config=ci", + "gs://edge-binaries-bucket/cockroach/workload.linux-gnu-arm64.1234567890abcdef CONTENTS env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxarmbase --norun_validations", "gs://edge-binaries-bucket/cockroach/workload.linux-gnu-arm64.LATEST/no-cache REDIRECT /cockroach/workload.linux-gnu-arm64.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/cockroach.darwin-amd64.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", + "-c opt --config=force_build_cdeps --config=crossmacosbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach.darwin-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach.darwin-amd64.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-amd64.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", + "-c opt --config=force_build_cdeps --config=crossmacosbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.darwin-amd64.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/lib/libgeos.darwin-amd64.1234567890abcdef.dylib CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", + "-c opt --config=force_build_cdeps --config=crossmacosbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos.darwin-amd64.dylib.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.darwin-amd64.1234567890abcdef.dylib", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.darwin-amd64.1234567890abcdef.dylib CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", + "-c opt --config=force_build_cdeps --config=crossmacosbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.darwin-amd64.dylib.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.darwin-amd64.1234567890abcdef.dylib", - "gs://edge-binaries-bucket/cockroach/cockroach.darwin-arm64.unsigned.1234567890abcdef CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", + "gs://edge-binaries-bucket/cockroach/cockroach.darwin-arm64.unsigned.1234567890abcdef CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=force_build_cdeps --config=crossmacosarmbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach.darwin-arm64.unsigned.LATEST/no-cache REDIRECT /cockroach/cockroach.darwin-arm64.unsigned.1234567890abcdef", - "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-arm64.unsigned.1234567890abcdef CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", + "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-arm64.unsigned.1234567890abcdef CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=force_build_cdeps --config=crossmacosarmbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-arm64.unsigned.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.darwin-arm64.unsigned.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/cockroach.windows-amd64.1234567890abcdef.exe CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql --enable_runfiles " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", + "-c opt --config=force_build_cdeps --config=crosswindowsbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach.windows-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach.windows-amd64.1234567890abcdef.exe", "gs://edge-binaries-bucket/cockroach/cockroach-sql.windows-amd64.1234567890abcdef.exe CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql --enable_runfiles " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", + "-c opt --config=force_build_cdeps --config=crosswindowsbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach-sql.windows-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.windows-amd64.1234567890abcdef.exe", }, platforms: release.DefaultPlatforms(), @@ -292,36 +292,36 @@ func TestPublish(t *testing.T) { }, expectedCmds: []string{ "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosslinuxbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64 version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64", - "env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxbase --config=ci", - "env=[] args=bazel info bazel-bin -c opt --config=crosslinuxbase --config=ci", + "env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=crosslinuxbase", }, expectedPuts: []string{ "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "-c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach.linux-gnu-amd64.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "-c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.linux-gnu-amd64.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64.1234567890abcdef.so CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "-c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.linux-gnu-amd64.1234567890abcdef.so", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64.1234567890abcdef.so CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "-c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.linux-gnu-amd64.1234567890abcdef.so", - "gs://edge-binaries-bucket/cockroach/workload.1234567890abcdef CONTENTS env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxbase --config=ci", + "gs://edge-binaries-bucket/cockroach/workload.1234567890abcdef CONTENTS env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxbase --norun_validations", "gs://edge-binaries-bucket/cockroach/workload.LATEST/no-cache REDIRECT /cockroach/workload.1234567890abcdef", }, platforms: release.Platforms{release.PlatformLinux}, @@ -334,87 +334,87 @@ func TestPublish(t *testing.T) { }, expectedCmds: []string{ "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosslinuxbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64 version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64", - "env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxbase --config=ci", - "env=[] args=bazel info bazel-bin -c opt --config=crosslinuxbase --config=ci", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=crosslinuxbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=force_build_cdeps --config=crosslinuxfipsbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosslinuxfipsbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64-fips version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64-fips", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64-fips", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", - "env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxarmbase --config=ci", - "env=[] args=bazel info bazel-bin -c opt --config=crosslinuxarmbase --config=ci", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -c opt --config=force_build_cdeps --config=crosslinuxarmbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosslinuxarmbase", + "env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxarmbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=crosslinuxarmbase", }, expectedPuts: []string{ "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "-c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach.linux-gnu-amd64.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "-c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.linux-gnu-amd64.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64.1234567890abcdef.so CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "-c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.linux-gnu-amd64.1234567890abcdef.so", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64.1234567890abcdef.so CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "-c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.linux-gnu-amd64.1234567890abcdef.so", - "gs://edge-binaries-bucket/cockroach/workload.1234567890abcdef CONTENTS env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxbase --config=ci", + "gs://edge-binaries-bucket/cockroach/workload.1234567890abcdef CONTENTS env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxbase --norun_validations", "gs://edge-binaries-bucket/cockroach/workload.LATEST/no-cache REDIRECT /cockroach/workload.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64-fips.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "-c opt --config=force_build_cdeps --config=crosslinuxfipsbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64-fips.LATEST/no-cache REDIRECT /cockroach/cockroach.linux-gnu-amd64-fips.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64-fips.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "-c opt --config=force_build_cdeps --config=crosslinuxfipsbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64-fips.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.linux-gnu-amd64-fips.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64-fips.1234567890abcdef.so CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "-c opt --config=force_build_cdeps --config=crosslinuxfipsbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64-fips.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.linux-gnu-amd64-fips.1234567890abcdef.so", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64-fips.1234567890abcdef.so CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "-c opt --config=force_build_cdeps --config=crosslinuxfipsbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64-fips.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.linux-gnu-amd64-fips.1234567890abcdef.so", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-arm64.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", + "-c opt --config=force_build_cdeps --config=crosslinuxarmbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-arm64.LATEST/no-cache REDIRECT /cockroach/cockroach.linux-gnu-arm64.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-arm64.1234567890abcdef CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", + "-c opt --config=force_build_cdeps --config=crosslinuxarmbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-arm64.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.linux-gnu-arm64.1234567890abcdef", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-arm64.1234567890abcdef.so CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", + "-c opt --config=force_build_cdeps --config=crosslinuxarmbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-arm64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.linux-gnu-arm64.1234567890abcdef.so", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-arm64.1234567890abcdef.so CONTENTS env=[] args=bazel build " + "//pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' " + - "-c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", + "-c opt --config=force_build_cdeps --config=crosslinuxarmbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-arm64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.linux-gnu-arm64.1234567890abcdef.so", - "gs://edge-binaries-bucket/cockroach/workload.linux-gnu-arm64.1234567890abcdef CONTENTS env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxarmbase --config=ci", + "gs://edge-binaries-bucket/cockroach/workload.linux-gnu-arm64.1234567890abcdef CONTENTS env=[] args=bazel build //pkg/cmd/workload -c opt --config=crosslinuxarmbase --norun_validations", "gs://edge-binaries-bucket/cockroach/workload.linux-gnu-arm64.LATEST/no-cache REDIRECT /cockroach/workload.linux-gnu-arm64.1234567890abcdef", }, platforms: release.Platforms{release.PlatformLinux, release.PlatformLinuxFIPS, release.PlatformLinuxArm}, diff --git a/pkg/cmd/publish-provisional-artifacts/main_test.go b/pkg/cmd/publish-provisional-artifacts/main_test.go index ec7b95f680d1..5c1d6ad703e7 100644 --- a/pkg/cmd/publish-provisional-artifacts/main_test.go +++ b/pkg/cmd/publish-provisional-artifacts/main_test.go @@ -172,27 +172,27 @@ func TestProvisional(t *testing.T) { }, expectedCmds: []string{ "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary release' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary release' -c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosslinuxbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64 version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary release' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary release' -c opt --config=force_build_cdeps --config=crosslinuxfipsbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosslinuxfipsbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64-fips version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64-fips", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64-fips", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary release' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary release' -c opt --config=force_build_cdeps --config=crosslinuxarmbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosslinuxarmbase", "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary release' -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary release' -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary release' -c opt --config=force_build_cdeps --config=crossmacosbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crossmacosbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary release' -c opt --config=force_build_cdeps --config=crossmacosarmbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crossmacosarmbase", "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql --enable_runfiles " + "'--workspace_status_command=." + - "/build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary release' -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", + "/build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary release' -c opt --config=force_build_cdeps --config=crosswindowsbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosswindowsbase", }, expectedGets: nil, expectedPuts: []string{ @@ -233,8 +233,8 @@ func TestProvisional(t *testing.T) { }, expectedCmds: []string{ "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary release' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary release' -c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosslinuxbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64 version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64", @@ -258,18 +258,18 @@ func TestProvisional(t *testing.T) { }, expectedCmds: []string{ "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary release' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary release' -c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosslinuxbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64 version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary release' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary release' -c opt --config=force_build_cdeps --config=crosslinuxfipsbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosslinuxfipsbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64-fips version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64-fips", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64-fips", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary release' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary release' -c opt --config=force_build_cdeps --config=crosslinuxarmbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosslinuxarmbase", }, expectedGets: nil, expectedPuts: []string{ @@ -299,27 +299,27 @@ func TestProvisional(t *testing.T) { }, expectedCmds: []string{ "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary release injected-tag' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary release injected-tag' -c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosslinuxbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64 version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary release injected-tag' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary release injected-tag' -c opt --config=force_build_cdeps --config=crosslinuxfipsbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosslinuxfipsbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64-fips version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64-fips", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64-fips", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary release injected-tag' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary release injected-tag' -c opt --config=force_build_cdeps --config=crosslinuxarmbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosslinuxarmbase", "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary release injected-tag' -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary release injected-tag' -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary release injected-tag' -c opt --config=force_build_cdeps --config=crossmacosbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crossmacosbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary release injected-tag' -c opt --config=force_build_cdeps --config=crossmacosarmbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crossmacosarmbase", "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql --enable_runfiles " + "'--workspace_status_command=." + - "/build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary release injected-tag' -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", + "/build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary release injected-tag' -c opt --config=force_build_cdeps --config=crosswindowsbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosswindowsbase", }, expectedGets: nil, expectedPuts: []string{ @@ -362,99 +362,99 @@ func TestProvisional(t *testing.T) { expectedCmds: []string{ "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=." + - "/build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "/build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosslinuxbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64 version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=force_build_cdeps --config=crosslinuxfipsbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosslinuxfipsbase", "env=[MALLOC_CONF=prof:true] args=./cockroach.linux-2.6.32-gnu-amd64-fips version", "env=[] args=ldd ./cockroach.linux-2.6.32-gnu-amd64-fips", "env=[] args=bazel run @go_sdk//:bin/go -- tool nm ./cockroach.linux-2.6.32-gnu-amd64-fips", "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -c opt --config=force_build_cdeps --config=crosslinuxarmbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosslinuxarmbase", "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", - "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config" + + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' -c opt --config=force_build_cdeps --config=crossmacosbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crossmacosbase", + "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=force_build_cdeps --config=crossmacosarmbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config" + "=crossmacosarmbase", "env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql --enable_runfiles " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", - "env=[] args=bazel info bazel-bin -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' -c opt --config=force_build_cdeps --config=crosswindowsbase --norun_validations", + "env=[] args=bazel info bazel-bin -c opt --config=force_build_cdeps --config=crosswindowsbase", }, expectedGets: nil, expectedPuts: []string{ "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64.00SHA00 " + "CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp." + - "sh x86_64-pc-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "sh x86_64-pc-linux-gnu official-binary' -c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64.LATEST/no-cache " + "REDIRECT /cockroach/cockroach.linux-gnu-amd64.00SHA00", - "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.linux-gnu-amd64.00SHA00", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64.00SHA00." + "so CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.linux-gnu-amd64.00SHA00.so", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64.00SHA00." + "so CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-binary' -c opt --config=force_build_cdeps --config=crosslinuxbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.linux-gnu-amd64.00SHA00.so", - "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64-fips.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64-fips.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=force_build_cdeps --config=crosslinuxfipsbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-amd64-fips.LATEST/no-cache REDIRECT /cockroach/cockroach.linux-gnu-amd64-fips.00SHA00", - "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64-fips.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64-fips.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=force_build_cdeps --config=crosslinuxfipsbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-amd64-fips.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.linux-gnu-amd64-fips.00SHA00", - "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64-fips.00SHA00.so CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64-fips.00SHA00.so CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=force_build_cdeps --config=crosslinuxfipsbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-amd64-fips.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.linux-gnu-amd64-fips.00SHA00.so", - "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64-fips.00SHA00.so CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxfipsbase", + "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64-fips.00SHA00.so CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-pc-linux-gnu official-fips-binary' -c opt --config=force_build_cdeps --config=crosslinuxfipsbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-amd64-fips.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.linux-gnu-amd64-fips.00SHA00.so", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-arm64.00SHA00 " + "CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp." + - "sh aarch64-unknown-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", + "sh aarch64-unknown-linux-gnu official-binary' -c opt --config=force_build_cdeps --config=crosslinuxarmbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach.linux-gnu-arm64.LATEST/no-cache " + "REDIRECT /cockroach/cockroach.linux-gnu-arm64.00SHA00", - "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-arm64.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", + "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-arm64.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -c opt --config=force_build_cdeps --config=crosslinuxarmbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach-sql.linux-gnu-arm64.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.linux-gnu-arm64.00SHA00", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-arm64.00SHA00." + "so CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -c opt --config=force_build_cdeps --config=crosslinuxarmbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos.linux-gnu-arm64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.linux-gnu-arm64.00SHA00.so", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-arm64.00SHA00." + "so CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosslinuxarmbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh aarch64-unknown-linux-gnu official-binary' -c opt --config=force_build_cdeps --config=crosslinuxarmbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.linux-gnu-arm64.so.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.linux-gnu-arm64.00SHA00.so", "gs://edge-binaries-bucket/cockroach/cockroach.darwin-amd64.00SHA00 " + "CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' -c opt --config=force_build_cdeps --config=crossmacosbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach.darwin-amd64.LATEST/no-cache " + "REDIRECT /cockroach/cockroach.darwin-amd64.00SHA00", - "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-amd64.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", + "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-amd64.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' -c opt --config=force_build_cdeps --config=crossmacosbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach-sql." + "darwin-amd64.00SHA00", "gs://edge-binaries-bucket/cockroach/lib/libgeos.darwin-amd64.00SHA00." + "dylib CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + - "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", + "'--workspace_status_command=./build/bazelutil/stamp.sh x86_64-apple-darwin19 official-binary' -c opt --config=force_build_cdeps --config=crossmacosbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos.darwin-amd64.dylib.LATEST/no-cache REDIRECT /cockroach/lib/libgeos.darwin-amd64.00SHA00.dylib", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.darwin-amd64.00SHA00." + "dylib CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql //c-deps:libgeos " + "'--workspace_status_command=./build/bazelutil/stamp." + - "sh x86_64-apple-darwin19 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosbase", + "sh x86_64-apple-darwin19 official-binary' -c opt --config=force_build_cdeps --config=crossmacosbase --norun_validations", "gs://edge-binaries-bucket/cockroach/lib/libgeos_c.darwin-amd64.dylib.LATEST/no-cache REDIRECT /cockroach/lib/libgeos_c.darwin-amd64.00SHA00.dylib", - "gs://edge-binaries-bucket/cockroach/cockroach.darwin-arm64.unsigned.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", + "gs://edge-binaries-bucket/cockroach/cockroach.darwin-arm64.unsigned.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=force_build_cdeps --config=crossmacosarmbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach.darwin-arm64.unsigned.LATEST/no-cache REDIRECT /cockroach/cockroach.darwin-arm64.unsigned.00SHA00", - "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-arm64.unsigned.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crossmacosarmbase", + "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-arm64.unsigned.00SHA00 CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql '--workspace_status_command=./build/bazelutil/stamp.sh aarch64-apple-darwin21.2 official-binary' -c opt --config=force_build_cdeps --config=crossmacosarmbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach-sql.darwin-arm64.unsigned.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.darwin-arm64.unsigned.00SHA00", "gs://edge-binaries-bucket/cockroach/cockroach.windows-amd64.00SHA00.exe " + "CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql --enable_runfiles " + "'--workspace_status_command=./build/bazelutil/stamp." + - "sh x86_64-w64-mingw32 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", + "sh x86_64-w64-mingw32 official-binary' -c opt --config=force_build_cdeps --config=crosswindowsbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach.windows-amd64.LATEST/no-cache " + "REDIRECT /cockroach/cockroach.windows-amd64.00SHA00.exe", - "gs://edge-binaries-bucket/cockroach/cockroach-sql.windows-amd64.00SHA00.exe CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql --enable_runfiles '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' -c opt --config=ci --config=force_build_cdeps --config=crosswindowsbase", + "gs://edge-binaries-bucket/cockroach/cockroach-sql.windows-amd64.00SHA00.exe CONTENTS env=[] args=bazel build //pkg/cmd/cockroach //pkg/cmd/cockroach-sql --enable_runfiles '--workspace_status_command=./build/bazelutil/stamp.sh x86_64-w64-mingw32 official-binary' -c opt --config=force_build_cdeps --config=crosswindowsbase --norun_validations", "gs://edge-binaries-bucket/cockroach/cockroach-sql.windows-amd64.LATEST/no-cache REDIRECT /cockroach/cockroach-sql.windows-amd64.00SHA00.exe", }, platforms: release.DefaultPlatforms(), diff --git a/pkg/release/build.go b/pkg/release/build.go index e3d5ce4e0fee..3b36a2f336ca 100644 --- a/pkg/release/build.go +++ b/pkg/release/build.go @@ -133,7 +133,7 @@ func MakeWorkload(platform Platform, opts BuildOptions, pkgDir string) error { } crossConfig := CrossConfigFromPlatform(platform) configArg := fmt.Sprintf("--config=%s", crossConfig) - cmd := exec.Command("bazel", "build", "//pkg/cmd/workload", "-c", "opt", configArg, "--config=ci") + cmd := exec.Command("bazel", "build", "//pkg/cmd/workload", "-c", "opt", configArg, "--norun_validations") cmd.Dir = pkgDir cmd.Stderr = os.Stderr log.Printf("%s", cmd.Args) @@ -142,7 +142,7 @@ func MakeWorkload(platform Platform, opts BuildOptions, pkgDir string) error { return errors.Wrapf(err, "failed to run %s: %s", cmd.Args, string(stdoutBytes)) } - bazelBin, err := getPathToBazelBin(opts.ExecFn, pkgDir, []string{"-c", "opt", configArg, "--config=ci"}) + bazelBin, err := getPathToBazelBin(opts.ExecFn, pkgDir, []string{"-c", "opt", configArg}) if err != nil { return err } @@ -176,8 +176,9 @@ func MakeRelease(platform Platform, opts BuildOptions, pkgDir string) error { stampCommand = fmt.Sprintf("--workspace_status_command=./build/bazelutil/stamp.sh %s %s", targetTriple, opts.Channel) } buildArgs = append(buildArgs, stampCommand) - configs := []string{"-c", "opt", "--config=ci", "--config=force_build_cdeps", fmt.Sprintf("--config=%s", CrossConfigFromPlatform(platform))} + configs := []string{"-c", "opt", "--config=force_build_cdeps", fmt.Sprintf("--config=%s", CrossConfigFromPlatform(platform))} buildArgs = append(buildArgs, configs...) + buildArgs = append(buildArgs, "--norun_validations") cmd := exec.Command("bazel", buildArgs...) cmd.Dir = pkgDir cmd.Stderr = os.Stderr