Feat/ci fix (scroll-tech#1103)

* CI-fix * Update wakeUpRunner.sh * Update wakeUpRunner.sh * Update select-runner.yml --------- Co-authored-by: 张三 <[email protected]>
Merlot21 · Feb 1, 2024 · 734d84b · 734d84b
1 parent 1e95486
commit 734d84b
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 25 deletions.
diff --git a/.github/ciChecksScripts/wakeUpRunner.sh b/.github/ciChecksScripts/wakeUpRunner.sh
@@ -1,49 +1,47 @@
 #!/bin/bash
 
 profile="cirunner"
-runner_vpc_id1="vpc-8bdf97ec"
-runner_vpc_id2="vpc-1176d875"
+runner_vpc_id="vpc-0323d32f82edcdec7"
 region_opt="--region us-west-2"
 
 # Get runner status
-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)
+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)
 
-{
-    while true; do
+# 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
         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}
+        if [[ $runner_status = "running" ]]; then
             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
-    done
-}&
+    else
+        sleep 30
+    fi
+done
+
+# start runner2
 while true; do
-    runner_status=$(aws ec2 describe-instances --profile $profile --instance-ids $runner2 --query "Reservations[*].Instances[*].State.[Name]" --output text)
+    runner_status=$(aws ec2 describe-instances --profile $profile --instance-ids $runner2 --query "Reservations[*].Instances[*].State.[Name]" ${region_opt} --output text)
     echo 'runner2 - '$runner_status
     if [[ $runner_status = "stopped" ]]; then
-        aws ec2 start-instances --profile $profile --instance-ids $runner2
+        aws ec2 start-instances --profile $profile --instance-ids $runner2 ${region_opt}
         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]" --output text)
+        runner_status=$(aws ec2 describe-instances --profile $profile --instance-ids $runner2 --query "Reservations[*].Instances[*].State.[Name]" ${region_opt} --output text)
         if [[ $runner_status = "running" ]]; then
             break
         fi
     else
         sleep 30
     fi
 done
-
-exit 0
diff --git a/.github/workflows/select-runner.yml b/.github/workflows/select-runner.yml
@@ -38,3 +38,13 @@ 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