Skip to content

Commit c528bf4

Browse files
OdidaOdida
committed
INF-526 Update to use the AIR Github setup
1 parent 58368ee commit c528bf4

File tree

2 files changed

+26
-66
lines changed

2 files changed

+26
-66
lines changed

‎.github/workflows/01-build-then-test.yml‎

Lines changed: 25 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ env:
2929

3030
jobs:
3131
lint:
32-
runs-on: [ data ]
32+
runs-on: [ fewsnet ]
3333
container: "python:3.11"
3434

3535
steps:
@@ -51,7 +51,7 @@ jobs:
5151
start-runner-test_branch:
5252
if: ${{ !(startsWith(github.ref, 'refs/tags/')) && !(github.ref == 'refs/heads/main') }}
5353
needs: lint
54-
runs-on: [ data ]
54+
runs-on: [ fewsnet ]
5555
outputs:
5656
label: ${{ steps.start-ec2-runner.outputs.label }}
5757
ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }}
@@ -62,24 +62,14 @@ jobs:
6262
aws-region: ${{ vars.AWS_REGION }}
6363
- name: Start EC2 runner test_branch
6464
id: start-ec2-runner
65-
uses: FEWS-NET/ec2-github-runner@1f687d4b786b21bed4ad6f420daddc7665bff857
65+
uses: American-Institutes-for-Research/gitops-actions/fewsnet-start-runner@main
6666
with:
67-
mode: start
68-
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
69-
ec2-image-id: ami-092d88ab9dba1ddc0
70-
ec2-instance-type: m5a.large
71-
subnet-id: subnet-0f50e5fa11397a87b
72-
security-group-id: sg-0c844cef0ffc13cde
73-
iam-role-name: data-prod-github-runner-role # optional, requires additional permissions
74-
aws-resource-tags: > # optional, requires additional permissions
75-
[
76-
{"Key": "Name", "Value": "HEA-github-autoscale-runner"},
77-
{"Key": "GitHubRepository", "Value": "${{ github.repository }}"}
78-
]
67+
gh_personal_access_token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
68+
project-key: "HEA"
7969

8070
start-runner-test_keepdb:
8171
needs: lint
82-
runs-on: [ data ]
72+
runs-on: [ fewsnet ]
8373
outputs:
8474
label: ${{ steps.start-ec2-runner.outputs.label }}
8575
ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }}
@@ -90,25 +80,15 @@ jobs:
9080
aws-region: ${{ env.AWS_REGION }}
9181
- name: Start EC2 runner test_keepdb
9282
id: start-ec2-runner
93-
uses: FEWS-NET/ec2-github-runner@1f687d4b786b21bed4ad6f420daddc7665bff857
83+
uses: American-Institutes-for-Research/gitops-actions/fewsnet-start-runner@main
9484
with:
95-
mode: start
96-
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
97-
ec2-image-id: ami-092d88ab9dba1ddc0
98-
ec2-instance-type: m5a.large
99-
subnet-id: subnet-0f50e5fa11397a87b
100-
security-group-id: sg-0c844cef0ffc13cde
101-
iam-role-name: data-prod-github-runner-role # optional, requires additional permissions
102-
aws-resource-tags: > # optional, requires additional permissions
103-
[
104-
{"Key": "Name", "Value": "HEA-github-autoscale-runner"},
105-
{"Key": "GitHubRepository", "Value": "${{ github.repository }}"}
106-
]
85+
gh_personal_access_token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
86+
project-key: "HEA"
10787

10888
start-runner-test_main:
10989
if: github.ref == 'refs/heads/main'
11090
needs: lint
111-
runs-on: [ data ]
91+
runs-on: [ fewsnet ]
11292
outputs:
11393
label: ${{ steps.start-ec2-runner.outputs.label }}
11494
ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }}
@@ -119,25 +99,15 @@ jobs:
11999
aws-region: ${{ vars.AWS_REGION }}
120100
- name: Start EC2 runner test_main
121101
id: start-ec2-runner
122-
uses: FEWS-NET/ec2-github-runner@1f687d4b786b21bed4ad6f420daddc7665bff857
102+
uses: American-Institutes-for-Research/gitops-actions/fewsnet-start-runner@main
123103
with:
124-
mode: start
125-
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
126-
ec2-image-id: ami-092d88ab9dba1ddc0
127-
ec2-instance-type: m5a.large
128-
subnet-id: subnet-0f50e5fa11397a87b
129-
security-group-id: sg-0c844cef0ffc13cde
130-
iam-role-name: data-prod-github-runner-role # optional, requires additional permissions
131-
aws-resource-tags: > # optional, requires additional permissions
132-
[
133-
{"Key": "Name", "Value": "HEA-github-autoscale-runner"},
134-
{"Key": "GitHubRepository", "Value": "${{ github.repository }}"}
135-
]
104+
gh_personal_access_token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
105+
project-key: "HEA"
136106

137107
start-runner-test_tag:
138108
if: startsWith(github.ref, 'refs/tags/')
139109
needs: lint
140-
runs-on: [ data ]
110+
runs-on: [ fewsnet ]
141111
outputs:
142112
label: ${{ steps.start-ec2-runner.outputs.label }}
143113
ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }}
@@ -148,20 +118,10 @@ jobs:
148118
aws-region: ${{ env.AWS_REGION }}
149119
- name: Start EC2 runner test_tag
150120
id: start-ec2-runner
151-
uses: FEWS-NET/ec2-github-runner@1f687d4b786b21bed4ad6f420daddc7665bff857
121+
uses: American-Institutes-for-Research/gitops-actions/fewsnet-start-runner@main
152122
with:
153-
mode: start
154-
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
155-
ec2-image-id: ami-092d88ab9dba1ddc0
156-
ec2-instance-type: m5a.large
157-
subnet-id: subnet-0f50e5fa11397a87b
158-
security-group-id: sg-0c844cef0ffc13cde
159-
iam-role-name: data-prod-github-runner-role # optional, requires additional permissions
160-
aws-resource-tags: > # optional, requires additional permissions
161-
[
162-
{"Key": "Name", "Value": "HEA-github-autoscale-runner"},
163-
{"Key": "GitHubRepository", "Value": "${{ github.repository }}"}
164-
]
123+
gh_personal_access_token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
124+
project-key: "HEA"
165125

166126
test_branch:
167127
if: ${{ !(startsWith(github.ref, 'refs/tags/')) && !(github.ref == 'refs/heads/main') }}
@@ -694,15 +654,15 @@ jobs:
694654
needs:
695655
- start-runner-test_branch # required to get output from the start-runner-test_branch job
696656
- test_branch # required to wait until the main jobs are done
697-
runs-on: [ data ]
657+
runs-on: [ fewsnet ]
698658

699659
steps:
700660
- name: Configure AWS credentials
701661
uses: aws-actions/configure-aws-credentials@v4
702662
with:
703663
aws-region: ${{ env.AWS_REGION }}
704664
- name: Stop EC2 runner
705-
uses: FEWS-NET/ec2-github-runner@1f687d4b786b21bed4ad6f420daddc7665bff857
665+
uses: American-Institutes-for-Research/ec2-github-runner@598310b0225c539534b6ef47575f36404dedf3b1
706666
with:
707667
mode: stop
708668
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
@@ -714,15 +674,15 @@ jobs:
714674
needs:
715675
- start-runner-test_keepdb # required to get output from the start-runner-test_keepdb job
716676
- test_keepdb
717-
runs-on: [ data ]
677+
runs-on: [ fewsnet ]
718678

719679
steps:
720680
- name: Configure AWS credentials
721681
uses: aws-actions/configure-aws-credentials@v4
722682
with:
723683
aws-region: ${{ env.AWS_REGION }}
724684
- name: Stop EC2 runner
725-
uses: FEWS-NET/ec2-github-runner@1f687d4b786b21bed4ad6f420daddc7665bff857
685+
uses: American-Institutes-for-Research/ec2-github-runner@598310b0225c539534b6ef47575f36404dedf3b1
726686
with:
727687
mode: stop
728688
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
@@ -734,15 +694,15 @@ jobs:
734694
needs:
735695
- start-runner-test_main # required to get output from the start-runner-test_main job
736696
- test_main
737-
runs-on: [ data ]
697+
runs-on: [ fewsnet ]
738698

739699
steps:
740700
- name: Configure AWS credentials
741701
uses: aws-actions/configure-aws-credentials@v4
742702
with:
743703
aws-region: ${{ env.AWS_REGION }}
744704
- name: Stop EC2 runner
745-
uses: FEWS-NET/ec2-github-runner@1f687d4b786b21bed4ad6f420daddc7665bff857
705+
uses: American-Institutes-for-Research/ec2-github-runner@598310b0225c539534b6ef47575f36404dedf3b1
746706
with:
747707
mode: stop
748708
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
@@ -754,15 +714,15 @@ jobs:
754714
needs:
755715
- start-runner-test_tag # required to get output from the start-runner-test_tag job
756716
- test_tag
757-
runs-on: [ data ]
717+
runs-on: [ fewsnet ]
758718

759719
steps:
760720
- name: Configure AWS credentials
761721
uses: aws-actions/configure-aws-credentials@v4
762722
with:
763723
aws-region: ${{ env.AWS_REGION }}
764724
- name: Stop EC2 runner
765-
uses: FEWS-NET/ec2-github-runner@1f687d4b786b21bed4ad6f420daddc7665bff857
725+
uses: American-Institutes-for-Research/ec2-github-runner@598310b0225c539534b6ef47575f36404dedf3b1
766726
with:
767727
mode: stop
768728
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}

‎.github/workflows/02-deploy-env.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
deploy_env:
2525
# this will allow us to access secrets defined for this environment
2626
environment: ${{ inputs.environment }}
27-
runs-on: [ data ]
27+
runs-on: [ fewsnet ]
2828
container:
2929
image: alpine:3.17
3030
defaults:

0 commit comments

Comments
 (0)