Skip to content
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.

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

ci: fix private roachtest nightly #135913

Merged
merged 1 commit into from
Nov 21, 2024

Conversation

srosenberg
Copy link
Member

It appears a change to TC wrapper scripts in [1]
may have caused the root var. to become unbound. This PR adds the missing source statement.

[1] #124592

Epic: none

Release note: None

@srosenberg srosenberg requested a review from a team as a code owner November 21, 2024 15:58
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@srosenberg srosenberg requested review from rickystewart and DarrylWong and removed request for a team November 21, 2024 16:11
@srosenberg
Copy link
Member Author

Confirmed the fix by triggering a run.

set -a
source "$dir/teamcity-support.sh"
set +a

source "$dir/teamcity-support.sh"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this line still needed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope 🤦 It was really missing set -a to export root.

It appears a change to TC wrapper scripts in [1]
may have caused the `root` var. to become unbound.
This PR adds the missing `source` statement.

[1] cockroachdb#124592

Epic: none

Release note: None
@srosenberg srosenberg force-pushed the sr/fix_private_roachtest_ci branch from 35e4e31 to c8bc807 Compare November 21, 2024 22:06
@srosenberg
Copy link
Member Author

TFTR!

bors r=darrylwong

@srosenberg srosenberg added backport-24.3.x Flags PRs that need to be backported to 24.3 backport-24.2.x Flags PRs that need to be backported to 24.2 backport-24.1.x Flags PRs that need to be backported to 24.1. labels Nov 21, 2024
@craig craig bot merged commit a9e35d9 into cockroachdb:master Nov 21, 2024
22 of 23 checks passed
Copy link

blathers-crl bot commented Nov 21, 2024

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from c8bc807 to blathers/backport-release-24.1-135913: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 24.1.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-24.1.x Flags PRs that need to be backported to 24.1. backport-24.2.x Flags PRs that need to be backported to 24.2 backport-24.3.x Flags PRs that need to be backported to 24.3
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants