Skip to content

Commit df256e0

Browse files
authored
fix: pass runner_ip to Windows EC2 terraform for per-run SG scoping (#2057)
1 parent 9fe25a6 commit df256e0

1 file changed

Lines changed: 36 additions & 6 deletions

File tree

.github/workflows/test-artifacts.yml

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,10 @@ jobs:
415415
- name: Echo Test Info
416416
run: echo run on ec2 instance os ${{ matrix.arrays.os }} arc ${{ matrix.arrays.arc }} test dir ${{ matrix.arrays.test_dir }}
417417

418+
419+
- name: Get Runner IP
420+
id: runner_ip
421+
run: echo "ip=$(curl -s ifconfig.me)/32" >> "$GITHUB_OUTPUT"
418422
- name: Install Terraform
419423
uses: hashicorp/setup-terraform@v3
420424
with:
@@ -503,7 +507,8 @@ jobs:
503507
-var="ec2_instance_type=${{ matrix.arrays.instanceType }}" \
504508
-var="github_test_repo=${{env.CWA_GITHUB_TEST_REPO_URL}}" \
505509
-var="github_test_repo_branch=${{ needs.OutputEnvVariables.outputs.CWA_GITHUB_TEST_REPO_BRANCH }}" \
506-
-var="s3_bucket=${S3_INTEGRATION_BUCKET}" ; then terraform destroy -auto-approve
510+
-var="s3_bucket=${S3_INTEGRATION_BUCKET}" \
511+
-var="runner_ip=${{ steps.runner_ip.outputs.ip }}" ; then terraform destroy -auto-approve
507512
else
508513
terraform destroy -auto-approve && exit 1
509514
fi
@@ -749,6 +754,10 @@ jobs:
749754
- name: Echo Test Info
750755
run: echo run on ec2 instance os ${{ matrix.arrays.os }} use ssm ${{ matrix.arrays.useSSM }} test ${{ matrix.arrays.test_dir }}
751756

757+
- name: Get Runner IP
758+
id: runner_ip
759+
run: echo "ip=$(curl -s ifconfig.me)/32" >> "$GITHUB_OUTPUT"
760+
752761
- name: Install Terraform
753762
uses: hashicorp/setup-terraform@v3
754763
with:
@@ -783,7 +792,8 @@ jobs:
783792
-var="test_dir=${{ matrix.arrays.test_dir }}" \
784793
-var="ami=${{ matrix.arrays.ami }}" \
785794
-var="use_ssm=${{ matrix.arrays.useSSM }}" \
786-
-var="s3_bucket=${S3_INTEGRATION_BUCKET}" ; then
795+
-var="s3_bucket=${S3_INTEGRATION_BUCKET}" \
796+
-var="runner_ip=${{ steps.runner_ip.outputs.ip }}" ; then
787797
terraform destroy -auto-approve
788798
else
789799
terraform destroy -auto-approve && exit 1
@@ -1343,6 +1353,10 @@ jobs:
13431353
aws-region: us-west-2
13441354
role-duration-seconds: ${{ env.TERRAFORM_AWS_ASSUME_ROLE_DURATION }}
13451355

1356+
1357+
- name: Get Runner IP
1358+
id: runner_ip
1359+
run: echo "ip=$(curl -s ifconfig.me)/32" >> "$GITHUB_OUTPUT"
13461360
- name: Install Terraform
13471361
uses: hashicorp/setup-terraform@v3
13481362
with:
@@ -1372,7 +1386,8 @@ jobs:
13721386
-var="ssh_key_name=${KEY_NAME}" \
13731387
-var="values_per_minute=${{ matrix.arrays.values_per_minute}}"\
13741388
-var="family=${{ matrix.arrays.family}}"\
1375-
-var="test_dir=${{ matrix.arrays.test_dir }}" ; then terraform destroy -auto-approve
1389+
-var="test_dir=${{ matrix.arrays.test_dir }}" \
1390+
-var="runner_ip=${{ steps.runner_ip.outputs.ip }}" ; then terraform destroy -auto-approve
13761391
else
13771392
terraform destroy -auto-approve && exit 1
13781393
fi
@@ -1424,6 +1439,10 @@ jobs:
14241439
aws-region: us-west-2
14251440
role-duration-seconds: ${{ env.TERRAFORM_AWS_ASSUME_ROLE_DURATION }}
14261441

1442+
1443+
- name: Get Runner IP
1444+
id: runner_ip
1445+
run: echo "ip=$(curl -s ifconfig.me)/32" >> "$GITHUB_OUTPUT"
14271446
- name: Install Terraform
14281447
uses: hashicorp/setup-terraform@v3
14291448
with:
@@ -1453,7 +1472,8 @@ jobs:
14531472
-var="ssh_key_name=${KEY_NAME}" \
14541473
-var="values_per_minute=${{ matrix.arrays.values_per_minute}}"\
14551474
-var="family=${{ matrix.arrays.family}}"\
1456-
-var="test_dir=${{ matrix.arrays.test_dir }}" ; then terraform destroy -auto-approve
1475+
-var="test_dir=${{ matrix.arrays.test_dir }}" \
1476+
-var="runner_ip=${{ steps.runner_ip.outputs.ip }}" ; then terraform destroy -auto-approve
14571477
else
14581478
terraform destroy -auto-approve && exit 1
14591479
fi
@@ -1505,6 +1525,10 @@ jobs:
15051525
aws-region: us-west-2
15061526
role-duration-seconds: ${{ env.TERRAFORM_AWS_ASSUME_ROLE_DURATION }}
15071527

1528+
1529+
- name: Get Runner IP
1530+
id: runner_ip
1531+
run: echo "ip=$(curl -s ifconfig.me)/32" >> "$GITHUB_OUTPUT"
15081532
- name: Install Terraform
15091533
uses: hashicorp/setup-terraform@v3
15101534
with:
@@ -1535,7 +1559,8 @@ jobs:
15351559
-var="s3_bucket=${S3_INTEGRATION_BUCKET}" \
15361560
-var="ssh_key_name=${KEY_NAME}" \
15371561
-var="values_per_minute=${{ matrix.arrays.values_per_minute}}"\
1538-
-var="test_dir=${{ matrix.arrays.test_dir }}" ; then terraform destroy -auto-approve
1562+
-var="test_dir=${{ matrix.arrays.test_dir }}" \
1563+
-var="runner_ip=${{ steps.runner_ip.outputs.ip }}" ; then terraform destroy -auto-approve
15391564
else
15401565
terraform destroy -auto-approve && exit 1
15411566
fi
@@ -1587,6 +1612,10 @@ jobs:
15871612
aws-region: us-west-2
15881613
role-duration-seconds: ${{ env.TERRAFORM_AWS_ASSUME_ROLE_DURATION }}
15891614

1615+
1616+
- name: Get Runner IP
1617+
id: runner_ip
1618+
run: echo "ip=$(curl -s ifconfig.me)/32" >> "$GITHUB_OUTPUT"
15901619
- name: Install Terraform
15911620
uses: hashicorp/setup-terraform@v3
15921621
with:
@@ -1618,7 +1647,8 @@ jobs:
16181647
-var="ssh_key_name=${KEY_NAME}" \
16191648
-var="values_per_minute=${{ matrix.arrays.values_per_minute}}"\
16201649
-var="family=${{ matrix.arrays.family}}"\
1621-
-var="test_dir=${{ matrix.arrays.test_dir }}" ; then terraform destroy -auto-approve
1650+
-var="test_dir=${{ matrix.arrays.test_dir }}" \
1651+
-var="runner_ip=${{ steps.runner_ip.outputs.ip }}" ; then terraform destroy -auto-approve
16221652
else
16231653
terraform destroy -auto-approve && exit 1
16241654
fi

0 commit comments

Comments
 (0)