From d6a1c525ddb408e90a44311e0a30c489f2ae2852 Mon Sep 17 00:00:00 2001 From: Sheetal-ayanworks <125483294+Sheetal-ayanworks@users.noreply.github.com> Date: Wed, 12 Jun 2024 23:16:20 +0530 Subject: [PATCH 1/4] Update stage-verification.yml Signed-off-by: Sheetal-ayanworks <125483294+Sheetal-ayanworks@users.noreply.github.com> --- .github/workflows/stage-verification.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/stage-verification.yml b/.github/workflows/stage-verification.yml index fff5ef178..1bdccbf55 100644 --- a/.github/workflows/stage-verification.yml +++ b/.github/workflows/stage-verification.yml @@ -72,8 +72,8 @@ jobs: NAME=$(sed -n 's/.*"name": "\(.*\)",/\1/p' stage-taskdef/verification-service.json) SERVICE_NAME="${NAME}-service" - # Replace placeholders in the JSON file - sed -e "s;%BUILD_NUMBER%;${{ github.run_number }};g" -e "s;%REPOSITORY_URI%;${REPOSITORY_URI};g" stage-taskdef/verification-service.json > ${GITHUB_WORKSPACE}/${NAME}-v_${{ github.run_number }}.json + # Replace placeholders in the JSON file + sed -e "s;%BUILD_NUMBER%;${{ github.run_number }};g" -e "s;%REPOSITORY_URI%;${REPOSITORY_URI};g" stage-taskdef/user-service.json > ${GITHUB_WORKSPACE}/${NAME}-v_${{ github.run_number }}.json # Debug: Print the content of the modified JSON file cat ${GITHUB_WORKSPACE}/${NAME}-v_${{ github.run_number }}.json @@ -97,4 +97,4 @@ jobs: # Update the existing service REVISION=$(aws ecs describe-task-definition --task-definition ${FAMILY} --region ap-southeast-1 | jq -r '.taskDefinition.revision') aws ecs update-service --cluster ${CLUSTER} --region ap-southeast-1 --service ${SERVICE_NAME} --task-definition ${FAMILY}:${REVISION} --desired-count ${DESIRED_COUNT} - fi \ No newline at end of file + fi From bb1d4e0b81851c349cd1f6b98d6c83174415047a Mon Sep 17 00:00:00 2001 From: Sheetal-ayanworks <125483294+Sheetal-ayanworks@users.noreply.github.com> Date: Wed, 12 Jun 2024 23:21:56 +0530 Subject: [PATCH 2/4] Update stage-verification.yml Signed-off-by: Sheetal-ayanworks <125483294+Sheetal-ayanworks@users.noreply.github.com> --- .github/workflows/stage-verification.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stage-verification.yml b/.github/workflows/stage-verification.yml index 1bdccbf55..18b22e56c 100644 --- a/.github/workflows/stage-verification.yml +++ b/.github/workflows/stage-verification.yml @@ -73,7 +73,7 @@ jobs: SERVICE_NAME="${NAME}-service" # Replace placeholders in the JSON file - sed -e "s;%BUILD_NUMBER%;${{ github.run_number }};g" -e "s;%REPOSITORY_URI%;${REPOSITORY_URI};g" stage-taskdef/user-service.json > ${GITHUB_WORKSPACE}/${NAME}-v_${{ github.run_number }}.json + sed -e "s;%BUILD_NUMBER%;${{ github.run_number }};g" -e "s;%REPOSITORY_URI%;${REPOSITORY_URI};g" stage-taskdef/verification-service.json > ${GITHUB_WORKSPACE}/${NAME}-v_${{ github.run_number }}.json # Debug: Print the content of the modified JSON file cat ${GITHUB_WORKSPACE}/${NAME}-v_${{ github.run_number }}.json From 2020b5aa5ce30adea4a93a7d5353d198418e5e84 Mon Sep 17 00:00:00 2001 From: Sheetal-ayanworks <125483294+Sheetal-ayanworks@users.noreply.github.com> Date: Thu, 13 Jun 2024 00:16:24 +0530 Subject: [PATCH 3/4] Update stage-verification.yml Signed-off-by: Sheetal-ayanworks <125483294+Sheetal-ayanworks@users.noreply.github.com> --- .github/workflows/stage-verification.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/stage-verification.yml b/.github/workflows/stage-verification.yml index 18b22e56c..b7d943eb2 100644 --- a/.github/workflows/stage-verification.yml +++ b/.github/workflows/stage-verification.yml @@ -95,6 +95,7 @@ jobs: DESIRED_COUNT="1" fi # Update the existing service + DESIRED_COUNT="1" REVISION=$(aws ecs describe-task-definition --task-definition ${FAMILY} --region ap-southeast-1 | jq -r '.taskDefinition.revision') aws ecs update-service --cluster ${CLUSTER} --region ap-southeast-1 --service ${SERVICE_NAME} --task-definition ${FAMILY}:${REVISION} --desired-count ${DESIRED_COUNT} fi From 62c5cf763bdcb64d632abd007602af019024b251 Mon Sep 17 00:00:00 2001 From: Sheetal-ayanworks <125483294+Sheetal-ayanworks@users.noreply.github.com> Date: Thu, 13 Jun 2024 00:44:51 +0530 Subject: [PATCH 4/4] Update stage-issuance.yml Signed-off-by: Sheetal-ayanworks <125483294+Sheetal-ayanworks@users.noreply.github.com> --- .github/workflows/stage-issuance.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/stage-issuance.yml b/.github/workflows/stage-issuance.yml index 10eb3db60..d27aacb54 100644 --- a/.github/workflows/stage-issuance.yml +++ b/.github/workflows/stage-issuance.yml @@ -72,7 +72,7 @@ jobs: run: | FAMILY=$(sed -n 's/.*"family": "\(.*\)",/\1/p' stage-taskdef/issuance-service.json) NAME=$(sed -n 's/.*"name": "\(.*\)",/\1/p' stage-taskdef/issuance-service.json) - SERVICE_NAME="${NAME}_service" + SERVICE_NAME="${NAME}-service" # Replace placeholders in the JSON file sed -e "s;%BUILD_NUMBER%;${{ github.run_number }};g" -e "s;%REPOSITORY_URI%;${REPOSITORY_URI};g" stage-taskdef/issuance-service.json > ${GITHUB_WORKSPACE}/${NAME}-v_${{ github.run_number }}.json @@ -99,4 +99,4 @@ jobs: # Update the existing service REVISION=$(aws ecs describe-task-definition --task-definition ${FAMILY} --region ap-southeast-1 | jq -r '.taskDefinition.revision') aws ecs update-service --cluster ${CLUSTER} --region ap-southeast-1 --service ${SERVICE_NAME} --task-definition ${FAMILY}:${REVISION} --desired-count ${DESIRED_COUNT} - fi \ No newline at end of file + fi