Skip to content

Commit e6f3429

Browse files
OdidaOdida
committed
INF-496 Update the runner configuration
1 parent f16269c commit e6f3429

File tree

2 files changed

+53
-53
lines changed

2 files changed

+53
-53
lines changed

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

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ env:
2929

3030
jobs:
3131
lint:
32-
runs-on: [self-hosted, ec2-runner]
32+
runs-on: [ data ]
3333
container: "python:3.11"
3434

3535
steps:
36-
- uses: "actions/checkout@v3"
36+
- uses: "actions/checkout@v4"
3737
with:
3838
ssh-key: ${{ secrets.GIT_SSH_PRIVATE_KEY }}
3939
# use ssh-key for updating submodules, will be removed in post-job
@@ -51,26 +51,26 @@ jobs:
5151
start-runner-test_branch:
5252
if: ${{ !(startsWith(github.ref, 'refs/tags/')) && !(github.ref == 'refs/heads/main') }}
5353
needs: lint
54-
runs-on: [self-hosted, ec2-runner]
54+
runs-on: [ data ]
5555
outputs:
5656
label: ${{ steps.start-ec2-runner.outputs.label }}
5757
ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }}
5858
steps:
5959
- name: Configure AWS credentials
60-
uses: aws-actions/configure-aws-credentials@v1
60+
uses: aws-actions/configure-aws-credentials@v4
6161
with:
6262
aws-region: ${{ env.AWS_REGION }}
6363
- name: Start EC2 runner test_branch
6464
id: start-ec2-runner
65-
uses: FEWS-NET/ec2-github-runner@076da0ed4e015d7c5bc6c8e1ad0ccef7106cb433
65+
uses: FEWS-NET/ec2-github-runner@1f687d4b786b21bed4ad6f420daddc7665bff857
6666
with:
6767
mode: start
6868
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
69-
ec2-image-id: ami-0da7ed013d60d14dc
70-
ec2-instance-type: m5.xlarge
71-
subnet-id: subnet-02bc23bcdd0792516
72-
security-group-id: sg-0e11a9c9e18cfb74b
73-
iam-role-name: github_runner_role # optional, requires additional permissions
69+
ec2-image-id: ami-092d88ab9dba1ddc0
70+
ec2-instance-type: m5.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
7474
aws-resource-tags: > # optional, requires additional permissions
7575
[
7676
{"Key": "Name", "Value": "ec2-github-autoscale-runner"},
@@ -105,29 +105,29 @@ jobs:
105105
106106
start-runner-test_keepdb:
107107
needs: lint
108-
runs-on: [self-hosted, ec2-runner]
108+
runs-on: [ data ]
109109
outputs:
110110
label: ${{ steps.start-ec2-runner.outputs.label }}
111111
ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }}
112112
steps:
113113
- name: Configure AWS credentials
114-
uses: aws-actions/configure-aws-credentials@v1
114+
uses: aws-actions/configure-aws-credentials@v4
115115
with:
116116
aws-region: ${{ env.AWS_REGION }}
117117
- name: Start EC2 runner test_keepdb
118118
id: start-ec2-runner
119-
uses: FEWS-NET/ec2-github-runner@076da0ed4e015d7c5bc6c8e1ad0ccef7106cb433
119+
uses: FEWS-NET/ec2-github-runner@1f687d4b786b21bed4ad6f420daddc7665bff857
120120
with:
121121
mode: start
122122
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
123-
ec2-image-id: ami-0da7ed013d60d14dc
124-
ec2-instance-type: m5.xlarge
125-
subnet-id: subnet-02bc23bcdd0792516
126-
security-group-id: sg-0e11a9c9e18cfb74b
127-
iam-role-name: github_runner_role # optional, requires additional permissions
123+
ec2-image-id: ami-092d88ab9dba1ddc0
124+
ec2-instance-type: m5.large
125+
subnet-id: subnet-0f50e5fa11397a87b
126+
security-group-id: sg-0c844cef0ffc13cde
127+
iam-role-name: data-prod-github-runner-role # optional, requires additional permissions
128128
aws-resource-tags: > # optional, requires additional permissions
129129
[
130-
{"Key": "Name", "Value": "ec2-github-autoscale-runner"},
130+
{"Key": "Name", "Value": "HEA-github-autoscale-runner"},
131131
{"Key": "GitHubRepository", "Value": "${{ github.repository }}"}
132132
]
133133
ecr_login-test_keepdb:
@@ -160,26 +160,26 @@ jobs:
160160
start-runner-test_main:
161161
if: github.ref == 'refs/heads/main'
162162
needs: lint
163-
runs-on: [self-hosted, ec2-runner]
163+
runs-on: [ data ]
164164
outputs:
165165
label: ${{ steps.start-ec2-runner.outputs.label }}
166166
ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }}
167167
steps:
168168
- name: Configure AWS credentials
169-
uses: aws-actions/configure-aws-credentials@v1
169+
uses: aws-actions/configure-aws-credentials@v4
170170
with:
171171
aws-region: ${{ env.AWS_REGION }}
172172
- name: Start EC2 runner test_main
173173
id: start-ec2-runner
174-
uses: FEWS-NET/ec2-github-runner@076da0ed4e015d7c5bc6c8e1ad0ccef7106cb433
174+
uses: FEWS-NET/ec2-github-runner@1f687d4b786b21bed4ad6f420daddc7665bff857
175175
with:
176176
mode: start
177177
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
178-
ec2-image-id: ami-0da7ed013d60d14dc
179-
ec2-instance-type: m5.xlarge
180-
subnet-id: subnet-02bc23bcdd0792516
181-
security-group-id: sg-0e11a9c9e18cfb74b
182-
iam-role-name: github_runner_role # optional, requires additional permissions
178+
ec2-image-id: ami-092d88ab9dba1ddc0
179+
ec2-instance-type: m5.large
180+
subnet-id: subnet-0f50e5fa11397a87b
181+
security-group-id: sg-0c844cef0ffc13cde
182+
iam-role-name: data-prod-github-runner-role # optional, requires additional permissions
183183
aws-resource-tags: > # optional, requires additional permissions
184184
[
185185
{"Key": "Name", "Value": "ec2-github-autoscale-runner"},
@@ -215,26 +215,26 @@ jobs:
215215
start-runner-test_tag:
216216
if: startsWith(github.ref, 'refs/tags/')
217217
needs: lint
218-
runs-on: [self-hosted, ec2-runner]
218+
runs-on: [ data ]
219219
outputs:
220220
label: ${{ steps.start-ec2-runner.outputs.label }}
221221
ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }}
222222
steps:
223223
- name: Configure AWS credentials
224-
uses: aws-actions/configure-aws-credentials@v1
224+
uses: aws-actions/configure-aws-credentials@v4
225225
with:
226226
aws-region: ${{ env.AWS_REGION }}
227227
- name: Start EC2 runner test_tag
228228
id: start-ec2-runner
229-
uses: FEWS-NET/ec2-github-runner@076da0ed4e015d7c5bc6c8e1ad0ccef7106cb433
229+
uses: FEWS-NET/ec2-github-runner@1f687d4b786b21bed4ad6f420daddc7665bff857
230230
with:
231231
mode: start
232232
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
233-
ec2-image-id: ami-0da7ed013d60d14dc
234-
ec2-instance-type: m5.xlarge
235-
subnet-id: subnet-02bc23bcdd0792516
236-
security-group-id: sg-0e11a9c9e18cfb74b
237-
iam-role-name: github_runner_role # optional, requires additional permissions
233+
ec2-image-id: ami-092d88ab9dba1ddc0
234+
ec2-instance-type: m5.large
235+
subnet-id: subnet-0f50e5fa11397a87b
236+
security-group-id: sg-0c844cef0ffc13cde
237+
iam-role-name: data-prod-github-runner-role # optional, requires additional permissions
238238
aws-resource-tags: > # optional, requires additional permissions
239239
[
240240
{"Key": "Name", "Value": "ec2-github-autoscale-runner"},
@@ -320,7 +320,7 @@ jobs:
320320
run: |
321321
for SERVICE in ${BUILD_IMAGES}; do (docker pull ${CI_REGISTRY_IMAGE}/${SERVICE}:edge | grep -i -e 'Pulling from' -e Digest -e Status -e Error) || true; done
322322
for SERVICE in ${BUILD_IMAGES}; do (docker pull ${CI_REGISTRY_IMAGE}/${SERVICE}:latest | grep -i -e 'Pulling from' -e Digest -e Status -e Error) || true; done
323-
- uses: "actions/checkout@v3"
323+
- uses: "actions/checkout@v4"
324324
with:
325325
ssh-key: ${{ secrets.GIT_SSH_PRIVATE_KEY }}
326326
# use ssh-key for updating submodules, will be removed in post-job
@@ -470,7 +470,7 @@ jobs:
470470
run: |
471471
for SERVICE in ${BUILD_IMAGES}; do (docker pull ${CI_REGISTRY_IMAGE}/${SERVICE}:edge | grep -i -e 'Pulling from' -e Digest -e Status -e Error) || true; done
472472
for SERVICE in ${BUILD_IMAGES}; do (docker pull ${CI_REGISTRY_IMAGE}/${SERVICE}:latest | grep -i -e 'Pulling from' -e Digest -e Status -e Error) || true; done
473-
- uses: "actions/checkout@v3"
473+
- uses: "actions/checkout@v4"
474474
with:
475475
ssh-key: ${{ secrets.GIT_SSH_PRIVATE_KEY }}
476476
# use ssh-key for updating submodules, will be removed in post-job
@@ -603,7 +603,7 @@ jobs:
603603
echo Using registry image ${CI_REGISTRY_IMAGE}
604604
for SERVICE in ${BUILD_IMAGES}; do (docker pull ${CI_REGISTRY_IMAGE}/${SERVICE}:edge | grep -i -e 'Pulling from' -e Digest -e Status -e Error) || true; done
605605
for SERVICE in ${BUILD_IMAGES}; do (docker pull ${CI_REGISTRY_IMAGE}/${SERVICE}:latest | grep -i -e 'Pulling from' -e Digest -e Status -e Error) || true; done
606-
- uses: "actions/checkout@v3"
606+
- uses: "actions/checkout@v4"
607607
with:
608608
ssh-key: ${{ secrets.GIT_SSH_PRIVATE_KEY }}
609609
# use ssh-key for updating submodules, will be removed in post-job
@@ -729,7 +729,7 @@ jobs:
729729
run: |
730730
# log in to Docker hub
731731
echo ${{ secrets.DOCKER_HUB_PASSWORD }} | docker login --username=${{ secrets.DOCKER_HUB_USERNAME }} --password-stdin
732-
- uses: "actions/checkout@v3"
732+
- uses: "actions/checkout@v4"
733733
with:
734734
ssh-key: ${{ secrets.GIT_SSH_PRIVATE_KEY }}
735735
# use ssh-key for updating submodules, will be removed in post-job
@@ -824,15 +824,15 @@ jobs:
824824
needs:
825825
- start-runner-test_branch # required to get output from the start-runner-test_branch job
826826
- test_branch # required to wait until the main jobs are done
827-
runs-on: [self-hosted, ec2-runner]
827+
runs-on: [ data ]
828828

829829
steps:
830830
- name: Configure AWS credentials
831-
uses: aws-actions/configure-aws-credentials@v1
831+
uses: aws-actions/configure-aws-credentials@v4
832832
with:
833833
aws-region: ${{ env.AWS_REGION }}
834834
- name: Stop EC2 runner
835-
uses: FEWS-NET/ec2-github-runner@076da0ed4e015d7c5bc6c8e1ad0ccef7106cb433
835+
uses: FEWS-NET/ec2-github-runner@1f687d4b786b21bed4ad6f420daddc7665bff857
836836
with:
837837
mode: stop
838838
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
@@ -844,15 +844,15 @@ jobs:
844844
needs:
845845
- start-runner-test_keepdb # required to get output from the start-runner-test_keepdb job
846846
- test_keepdb
847-
runs-on: [self-hosted, ec2-runner]
847+
runs-on: [ data ]
848848

849849
steps:
850850
- name: Configure AWS credentials
851-
uses: aws-actions/configure-aws-credentials@v1
851+
uses: aws-actions/configure-aws-credentials@v4
852852
with:
853853
aws-region: ${{ env.AWS_REGION }}
854854
- name: Stop EC2 runner
855-
uses: FEWS-NET/ec2-github-runner@076da0ed4e015d7c5bc6c8e1ad0ccef7106cb433
855+
uses: FEWS-NET/ec2-github-runner@1f687d4b786b21bed4ad6f420daddc7665bff857
856856
with:
857857
mode: stop
858858
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
@@ -864,15 +864,15 @@ jobs:
864864
needs:
865865
- start-runner-test_main # required to get output from the start-runner-test_main job
866866
- test_main
867-
runs-on: [self-hosted, ec2-runner]
867+
runs-on: [ data ]
868868

869869
steps:
870870
- name: Configure AWS credentials
871-
uses: aws-actions/configure-aws-credentials@v1
871+
uses: aws-actions/configure-aws-credentials@v4
872872
with:
873873
aws-region: ${{ env.AWS_REGION }}
874874
- name: Stop EC2 runner
875-
uses: FEWS-NET/ec2-github-runner@076da0ed4e015d7c5bc6c8e1ad0ccef7106cb433
875+
uses: FEWS-NET/ec2-github-runner@1f687d4b786b21bed4ad6f420daddc7665bff857
876876
with:
877877
mode: stop
878878
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
@@ -884,15 +884,15 @@ jobs:
884884
needs:
885885
- start-runner-test_tag # required to get output from the start-runner-test_tag job
886886
- test_tag
887-
runs-on: [self-hosted, ec2-runner]
887+
runs-on: [ data ]
888888

889889
steps:
890890
- name: Configure AWS credentials
891-
uses: aws-actions/configure-aws-credentials@v1
891+
uses: aws-actions/configure-aws-credentials@v4
892892
with:
893893
aws-region: ${{ env.AWS_REGION }}
894894
- name: Stop EC2 runner
895-
uses: FEWS-NET/ec2-github-runner@076da0ed4e015d7c5bc6c8e1ad0ccef7106cb433
895+
uses: FEWS-NET/ec2-github-runner@1f687d4b786b21bed4ad6f420daddc7665bff857
896896
with:
897897
mode: stop
898898
github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ env:
1717
ENV: ${{ inputs.environment }}
1818

1919
# AWS Variables
20-
ECS_CLUSTER: "fnt_ecs"
20+
ECS_CLUSTER: "data-prod-ecs-cluster"
2121
AWS_REGION: "us-east-1"
2222

2323
jobs:
2424
deploy_env:
2525
# this will allow us to access secrets defined for this environment
2626
environment: ${{ inputs.environment }}
27-
runs-on: [self-hosted, ec2-runner]
27+
runs-on: [ data ]
2828
container:
2929
image: alpine:3.17
3030
defaults:

0 commit comments

Comments
 (0)