Skip to content

testutils.skip/ci: set COCKROACH_NIGHTLY_STRESS during nightlies #153135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −7
Open

testutils.skip/ci: set COCKROACH_NIGHTLY_STRESS during nightlies #153135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/teamcity/cockroach/nightlies/stress_engflow.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

set -euo pipefail

export EXTRA_TEST_ARGS="--config use_ci_timeouts"
export EXTRA_TEST_ARGS="--config use_ci_timeoutsi --test_env=COCKROACH_NIGHTLY_STRESS=true"

THIS_DIR=$(cd "$(dirname "$0")" && pwd)

Expand Down
2 changes: 1 addition & 1 deletion build/teamcity/cockroach/nightlies/stress_engflow_deadlock.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
set -euo pipefail

export RUNS_PER_TEST=3
export EXTRA_TEST_ARGS="--define gotags=bazel,gss,deadlock --test_timeout=300,1000,1500,2400 --heavy"
export EXTRA_TEST_ARGS="--define gotags=bazel,gss,deadlock --test_env=COCKROACH_NIGHTLY_STRESS=true --test_timeout=300,1000,1500,2400 --heavy"
export EXTRA_ISSUE_PARAMS=deadlock

THIS_DIR=$(cd "$(dirname "$0")" && pwd)
Expand Down
2 changes: 1 addition & 1 deletion build/teamcity/cockroach/nightlies/stress_engflow_race.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
set -euo pipefail

export RUNS_PER_TEST=3
export EXTRA_TEST_ARGS="--config=race --test_timeout=1200,2500,3200,4600"
export EXTRA_TEST_ARGS="--config=race --test_env=COCKROACH_NIGHTLY_STRESS=true --test_timeout=1200,2500,3200,4600"
export EXTRA_ISSUE_PARAMS=race

THIS_DIR=$(cd "$(dirname "$0")" && pwd)
Expand Down
5 changes: 2 additions & 3 deletions pkg/testutils/skip/stress.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ func NightlyStress() bool {
return nightlyStress
}

// Stress returns true iff the process is running under any instance of the stress
// harness, including the nightly one.
// Stress returns true iff the process is running under a local _dev_ instance of the stress, i.e., ./dev test ... --stress
func Stress() bool {
return stress || nightlyStress
return stress
}
2 changes: 1 addition & 1 deletion pkg/util/startup/startup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func TestStartupFailureRandomRange(t *testing.T) {
// run it under nightly (skipping race builds because with many nodes they are
// very resource intensive and tend to collapse).
skip.UnderRace(t, "6 nodes with replication is too slow for race")
if !skip.NightlyStress() {
if !skip.Stress() {
skip.IgnoreLint(t, "test takes 30s to run due to circuit breakers and timeouts")
}

Expand Down