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

Revert "Feat/ci fix" #1102

Merged
merged 1 commit into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
48 changes: 25 additions & 23 deletions .github/ciChecksScripts/wakeUpRunner.sh
Original file line number Diff line number Diff line change
@@ -1,47 +1,49 @@
#!/bin/bash

profile="cirunner"
runner_vpc_id="vpc-0323d32f82edcdec7"
runner_vpc_id1="vpc-8bdf97ec"
runner_vpc_id2="vpc-1176d875"
region_opt="--region us-west-2"

# Get runner status
runner1=$(aws ec2 describe-instances --profile $profile --filters Name=tag:Name,Values=[super1] Name=network-interface.vpc-id,Values=[$runner_vpc_id] --query "Reservations[*].Instances[*][InstanceId]" ${region_opt} --output text | xargs)
runner2=$(aws ec2 describe-instances --profile $profile --filters Name=tag:Name,Values=[super2] Name=network-interface.vpc-id,Values=[$runner_vpc_id] --query "Reservations[*].Instances[*][InstanceId]" ${region_opt} --output text | xargs)
runner1=$(aws ec2 describe-instances --profile $profile --filters Name=tag:Name,Values=[jenkins] Name=network-interface.vpc-id,Values=[$runner_vpc_id1] --query "Reservations[*].Instances[*][InstanceId]" ${region_opt} --output text | xargs)
runner2=$(aws ec2 describe-instances --profile $profile --filters Name=tag:Name,Values=[jenkins] Name=network-interface.vpc-id,Values=[$runner_vpc_id2] --query "Reservations[*].Instances[*][InstanceId]" --output text | xargs)

# start runner1
while true; do
runner_status=$(aws ec2 describe-instances --profile $profile --instance-ids $runner1 --query "Reservations[*].Instances[*].State.[Name]" ${region_opt} --output text)
echo 'runner1 - '$runner_status
if [[ $runner_status = "stopped" ]]; then
aws ec2 start-instances --profile $profile --instance-ids $runner1 ${region_opt}
break
elif [[ $runner_status = "running" ]]; then
echo 'waiting for runner1 restore'
sleep 30
{
while true; do
runner_status=$(aws ec2 describe-instances --profile $profile --instance-ids $runner1 --query "Reservations[*].Instances[*].State.[Name]" ${region_opt} --output text)
if [[ $runner_status = "running" ]]; then
echo 'runner1 - '$runner_status
if [[ $runner_status = "stopped" ]]; then
aws ec2 start-instances --profile $profile --instance-ids $runner1 ${region_opt}
break
elif [[ $runner_status = "running" ]]; then
echo 'waiting for runner1 restore'
sleep 30
runner_status=$(aws ec2 describe-instances --profile $profile --instance-ids $runner1 --query "Reservations[*].Instances[*].State.[Name]" ${region_opt} --output text)
if [[ $runner_status = "running" ]]; then
break
fi
else
sleep 30
fi
else
sleep 30
fi
done

# start runner2
done
}&
while true; do
runner_status=$(aws ec2 describe-instances --profile $profile --instance-ids $runner2 --query "Reservations[*].Instances[*].State.[Name]" ${region_opt} --output text)
runner_status=$(aws ec2 describe-instances --profile $profile --instance-ids $runner2 --query "Reservations[*].Instances[*].State.[Name]" --output text)
echo 'runner2 - '$runner_status
if [[ $runner_status = "stopped" ]]; then
aws ec2 start-instances --profile $profile --instance-ids $runner2 ${region_opt}
aws ec2 start-instances --profile $profile --instance-ids $runner2
break
elif [[ $runner_status = "running" ]]; then
echo 'waiting for runner2 restore'
sleep 30
runner_status=$(aws ec2 describe-instances --profile $profile --instance-ids $runner2 --query "Reservations[*].Instances[*].State.[Name]" ${region_opt} --output text)
runner_status=$(aws ec2 describe-instances --profile $profile --instance-ids $runner2 --query "Reservations[*].Instances[*].State.[Name]" --output text)
if [[ $runner_status = "running" ]]; then
break
fi
else
sleep 30
fi
done

exit 0
10 changes: 0 additions & 10 deletions .github/workflows/select-runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,3 @@ jobs:
outputs:
matrix1: ${{ toJSON( fromJSON(inputs.matrices)[1] ) }}
matrix2: ${{ toJSON( fromJSON(inputs.matrices)[2] ) }}

wakeup:
name: Wake up self-hosted runner
if: ${{ inputs.enabled }}
needs: [select]
runs-on: ${{ inputs.bastion-host }}
concurrency: ${{ needs.select.outputs.matrix1 }}
steps:
- uses: actions/checkout@v4
- run: .github/ciChecksScripts/wakeUpRunner.sh
Loading