Skip to content

Commit 13e3e1f

Browse files
craig[bot]srosenberg
andcommitted
Merge #152766
152766: ci: fix roachtest ibm nightly r=darrylwong a=srosenberg Recent PR [1] enabled metamorphic runs of FIPS for all roachtest nightlies. The default uses a low value (0.02) which can be overriden via CI's FIPS_PROBABILITY; i.e., setting it to zero disables metamorphic FIPS runs. However, `FIPS_PROBABILITY` wasn't being injected into the environment of the roachtest script. This resulted in failure since roachtest refuses to run without a FIPS binary. Currently, FIPS isn't supported in ibm nightly, so this change fixes the env var propagation and effectitvely disables FIPS. [1] #139510 Epic: none Release note: None Co-authored-by: Stan Rosenberg <[email protected]>
2 parents e3770b8 + 5bf1f0d commit 13e3e1f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

build/teamcity/cockroach/nightlies/roachtest_nightly_ibm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ dir="$(dirname $(dirname $(dirname $(dirname "${0}"))))"
1313
source "$dir/teamcity-support.sh" # For $root
1414
source "$dir/teamcity-bazel-support.sh" # For run_bazel
1515

16-
BAZEL_SUPPORT_EXTRA_DOCKER_ARGS="-e LITERAL_ARTIFACTS_DIR=$root/artifacts -e IBM_APIKEY -e BUILD_VCS_NUMBER -e CLOUD -e COCKROACH_DEV_LICENSE -e TESTS -e COUNT -e GITHUB_API_TOKEN -e GITHUB_ORG -e GITHUB_REPO -e GOOGLE_EPHEMERAL_CREDENTIALS -e SLACK_TOKEN -e TC_BUILDTYPE_ID -e TC_BUILD_BRANCH -e TC_BUILD_ID -e TC_SERVER_URL -e SELECT_PROBABILITY -e COCKROACH_RANDOM_SEED -e ROACHTEST_ASSERTIONS_ENABLED_SEED -e ROACHTEST_FORCE_RUN_INVALID_RELEASE_BRANCH -e CLEAR_CLUSTER_CACHE -e ARM_PROBABILITY -e USE_SPOT -e SELECTIVE_TESTS -e SNOWFLAKE_USER -e SNOWFLAKE_PVT_KEY -e SIDE_EYE_API_TOKEN -e COCKROACH_EA_PROBABILITY -e EXPORT_OPENMETRICS -e ROACHPERF_OPENMETRICS_CREDENTIALS -e MVT_UPGRADE_PATH -e MVT_DEPLOYMENT_MODE -e EXTRA_ROACHTEST_ARGS" \
16+
BAZEL_SUPPORT_EXTRA_DOCKER_ARGS="-e LITERAL_ARTIFACTS_DIR=$root/artifacts -e IBM_APIKEY -e BUILD_VCS_NUMBER -e CLOUD -e COCKROACH_DEV_LICENSE -e TESTS -e COUNT -e GITHUB_API_TOKEN -e GITHUB_ORG -e GITHUB_REPO -e GOOGLE_EPHEMERAL_CREDENTIALS -e SLACK_TOKEN -e TC_BUILDTYPE_ID -e TC_BUILD_BRANCH -e TC_BUILD_ID -e TC_SERVER_URL -e SELECT_PROBABILITY -e COCKROACH_RANDOM_SEED -e ROACHTEST_ASSERTIONS_ENABLED_SEED -e ROACHTEST_FORCE_RUN_INVALID_RELEASE_BRANCH -e CLEAR_CLUSTER_CACHE -e ARM_PROBABILITY -e FIPS_PROBABILITY -e USE_SPOT -e SELECTIVE_TESTS -e SNOWFLAKE_USER -e SNOWFLAKE_PVT_KEY -e COCKROACH_EA_PROBABILITY -e EXPORT_OPENMETRICS -e ROACHPERF_OPENMETRICS_CREDENTIALS -e MVT_UPGRADE_PATH -e MVT_DEPLOYMENT_MODE -e EXTRA_ROACHTEST_ARGS" \
1717
run_bazel build/teamcity/cockroach/nightlies/roachtest_nightly_impl.sh

0 commit comments

Comments
 (0)