Skip to content

fix: Merge queue instances have pr name for uniquness in e.g. reorgs. #14562

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

Merged
charlielye merged 1 commit into from
May 28, 2025
Merged

fix: Merge queue instances have pr name for uniquness in e.g. reorgs. #14562

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
8 changes: 8 additions & 0 deletions ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,14 @@ case "$cmd" in
export JOB_ID="x1-full"
exec bootstrap_ec2 "./bootstrap.sh ci-full"
;;
"grind")
# Spin up ec2 instance and run the merge-queue flow.
run() {
JOB_ID=$1 INSTANCE_POSTFIX=$1 ARCH=$2 exec denoise "bootstrap_ec2 './bootstrap.sh $3'"
}
export -f run
seq 1 ${1:-5} | parallel --termseq 'TERM,10000' --line-buffered --halt now,fail=1 'run $USER-x{}-full amd64 ci-full'
;;
"merge-queue")
# Spin up ec2 instance and run the merge-queue flow.
run() {
Expand Down
9 changes: 6 additions & 3 deletions ci3/bootstrap_ec2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,13 @@ if [[ "$(git fetch origin --negotiate-only --negotiation-tip=$current_commit)" !
exit 1
fi

if [ "$REF_NAME" == "master" ]; then
# Allow parallelism on master by having the instance name be the commit.
instance_name="$current_commit"_$arch
# Our instance_name acts as a uniqueness key for the instance.
# Instances are terminated if they exist with the same name.
if [[ "$REF_NAME" =~ ^gh-readonly-queue/.*(pr-[0-9]+) ]]; then
# In merge queue, use the pr number as the instance name.
instance_name="${BASH_REMATCH[1]}_$arch"
else
# In local or pr's, use the branch name as the instance name.
instance_name=$(echo -n "$REF_NAME" | head -c 50 | tr -c 'a-zA-Z0-9-' '_')_$arch
fi

Expand Down