Merge pull request #1326 from ChildMindInstitute/M2-6595-Configure-De…

…ploy-to-Test/UAT test deployment to dev
ChildMindInstitute · May 23, 2024 · f761ac0 · f761ac0
2 parents f50660d + 824ebae
commit f761ac0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/.github/workflows/run_deploy_dev.yaml b/.github/workflows/run_deploy_dev.yaml
@@ -8,6 +8,7 @@ jobs:
 
   deploy_to_ecs:
     runs-on: ubuntu-latest
+    if: github.event.pull_request.merged
     env:
       TASK_FAMILY_PREFIX: backend
       ECS_CLUSTER_NAME: cmiml-dev
@@ -16,9 +17,8 @@ jobs:
       IMAGE_PREFIX: ${{ github.ref_name }}
       COMMIT_HASH: ${{ github.sha }}
       AWS_REGION : "us-east-1"
-    if: ${{ github.event_name == 'pull_request' && github.event.action == 'closed' }}
+
     steps:
-
       - name: configure aws credentials
         uses: aws-actions/configure-aws-credentials@v3
         with:

diff --git a/.github/workflows/run_deploy_test.yaml b/.github/workflows/run_deploy_test.yaml
@@ -13,7 +13,7 @@ jobs:
 
   deploy_to_ecs:
     runs-on: ubuntu-latest
-    if: ${{ github.ref_name == v[0-9]+.[0-9]+.[0-9]+([0-9]+)+-+rc(.+) }}
+    if: contains(github.ref, '-rc')
     env:
       TASK_FAMILY: backend_api
       ECS_CLUSTER_NAME: cmiml-test

diff --git a/.github/workflows/run_deploy_uat.yaml b/.github/workflows/run_deploy_uat.yaml
@@ -13,7 +13,7 @@ jobs:
 
   deploy_to_ecs:
     runs-on: ubuntu-latest
-    if: ${{ github.ref_name == v[0-9]+.[0-9]+.[0-9]+([0-9]+)+-+rc(.+) }}
+    if: contains(github.ref, '-rc')
     env:
       TASK_FAMILY: backend_api
       ECS_CLUSTER_NAME: cmiml-uat
@@ -34,16 +34,13 @@ jobs:
           role-to-assume: arn:aws:iam::641513112151:role/cmiml-devops-oidc-github-role
           role-session-name: OIDC-GHA-session
           aws-region: ${{ env.AWS_REGION }}
-
-      - name: change image in the task definition
-        run: |
-          TASK_DEFINITION=$(aws ecs describe-task-definition --task-definition ${{ env.TASK_FAMILY }} --region ${{ env.AWS_REGION }})
-          COMMIT_HASH_SHORT=$(echo $COMMIT_HASH | cut -c1-5) 
-          NEW_IMAGE=${IMAGE_PREFIX/\//-}-$COMMIT_HASH_SHORT
-          echo $NEW_IMAGE
-          NEW_TASK_DEFINTIION=$(echo $TASK_DEFINITION | jq --arg IMAGE "$ECR_REPO:$NEW_IMAGE" '.taskDefinition | .containerDefinitions[0].image = $IMAGE | del(.taskDefinitionArn) | del(.revision) | del(.status) | del(.requiresAttributes) | del(.compatibilities) | del(.registeredAt) | del(.registeredBy)')
-          aws ecs register-task-definition --region ${{ env.AWS_REGION }} --cli-input-json "$NEW_TASK_DEFINTIION"
 
-      - name: update ECS service
+      - name: change image in the task definitions and update services
         run: |
-          aws ecs update-service --cluster ${{ env.ECS_CLUSTER_NAME }} --service ${{ env.ECS_SERVICE_NAME }} --task-definition ${{ env.TASK_FAMILY }}
+          NEW_IMAGE=${IMAGE_PREFIX/\//-}-$(echo $COMMIT_HASH | cut -c1-5) 
+
+          for app in api worker scheduler; do 
+            NEW_TASK_DEFINITION=$(aws ecs describe-task-definition --task-definition ${TASK_FAMILY_PREFIX}_${app} --region ${AWS_REGION} | jq --arg IMAGE "$ECR_REPO:$NEW_IMAGE" '.taskDefinition | .containerDefinitions[0].image = $IMAGE | del(.taskDefinitionArn) | del(.revision) | del(.status) | del(.requiresAttributes) | del(.compatibilities) | del(.registeredAt) | del(.registeredBy)')
+            aws ecs register-task-definition --region ${{ env.AWS_REGION }} --cli-input-json "$NEW_TASK_DEFINTIION"
+            aws ecs update-service --cluster ${{ env.ECS_CLUSTER_NAME }} --service ${{ env.ECS_SERVICE_NAME }}_${app} --task-definition ${TASK_FAMILY_PREFIX}_${app}
+          done