[MDS-5064] Bug Fix - Gitops deploys and updates deployment revision n…

…umber before polling can happen
bcgov · Jul 24, 2023 · 41bff9a · 41bff9a
1 parent 23a3c39
commit 41bff9a
Show file tree

Hide file tree

Showing 22 changed files with 131 additions and 27 deletions.
diff --git a/.github/workflows/core-api.build.deploy.dev.yaml b/.github/workflows/core-api.build.deploy.dev.yaml
@@ -66,10 +66,15 @@ jobs:
         uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4.7"
+      - name: Setup ArgoCD CLI
+        if: ${{ env.NEEDS_ROLLOUT=='true' }}
+        uses: imajeetyadav/argocd-cli@v1
+        with:
+          version: v2.7.8
       - name: oc login
         run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
       - name: Notification
-        run: ./gitops/watch-deployment.sh core-api dev ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }}
+        run: ./gitops/watch-deployment.sh core-api dev ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGOCD_JWT }}
 
   run-if-failed:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/core-api.deploy.prod.yaml b/.github/workflows/core-api.deploy.prod.yaml
@@ -46,10 +46,15 @@ jobs:
         uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4.7"
+      - name: Setup ArgoCD CLI
+        if: ${{ env.NEEDS_ROLLOUT=='true' }}
+        uses: imajeetyadav/argocd-cli@v1
+        with:
+          version: v2.7.8
       - name: oc login
         run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
       - name: Notification
-        run: ./gitops/watch-deployment.sh core-api prod ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }}
+        run: ./gitops/watch-deployment.sh core-api prod ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGOCD_JWT }}
 
   run-if-failed:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/core-api.deploy.test.yaml b/.github/workflows/core-api.deploy.test.yaml
@@ -47,12 +47,17 @@ jobs:
         uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4.7"
+      - name: Setup ArgoCD CLI
+        if: ${{ env.NEEDS_ROLLOUT=='true' }}
+        uses: imajeetyadav/argocd-cli@v1
+        with:
+          version: v2.7.8
       - name: oc login
         if: ${{ env.NEEDS_ROLLOUT=='true' }}
         run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
       - name: Notification
         if: ${{ env.NEEDS_ROLLOUT=='true' }}
-        run: ./gitops/watch-deployment.sh core-api test ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }}
+        run: ./gitops/watch-deployment.sh core-api test ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGOCD_JWT }}
 
   run-if-failed:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/core-web.build.deploy.dev.yaml b/.github/workflows/core-web.build.deploy.dev.yaml
@@ -50,10 +50,15 @@ jobs:
         uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4.7"
+      - name: Setup ArgoCD CLI
+        if: ${{ env.NEEDS_ROLLOUT=='true' }}
+        uses: imajeetyadav/argocd-cli@v1
+        with:
+          version: v2.7.8
       - name: oc login
         run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
       - name: Notification
-        run: ./gitops/watch-deployment.sh core-web dev ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }}
+        run: ./gitops/watch-deployment.sh core-web dev ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGOCD_JWT }}
 
   run-if-failed:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/core-web.deploy.prod.yaml b/.github/workflows/core-web.deploy.prod.yaml
@@ -40,10 +40,15 @@ jobs:
         uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4.7"
+      - name: Setup ArgoCD CLI
+        if: ${{ env.NEEDS_ROLLOUT=='true' }}
+        uses: imajeetyadav/argocd-cli@v1
+        with:
+          version: v2.7.8
       - name: oc login
         run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
       - name: Notification
-        run: ./gitops/watch-deployment.sh core-web prod ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }}
+        run: ./gitops/watch-deployment.sh core-web prod ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGOCD_JWT }}
 
   run-if-failed:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/core-web.deploy.test.yaml b/.github/workflows/core-web.deploy.test.yaml
@@ -43,12 +43,17 @@ jobs:
         uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4.7"
+      - name: Setup ArgoCD CLI
+        if: ${{ env.NEEDS_ROLLOUT=='true' }}
+        uses: imajeetyadav/argocd-cli@v1
+        with:
+          version: v2.7.8
       - name: oc login
         if: ${{ env.NEEDS_ROLLOUT=='true' }}
         run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
       - name: Notification
         if: ${{ env.NEEDS_ROLLOUT=='true' }}
-        run: ./gitops/watch-deployment.sh core-web test ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }}
+        run: ./gitops/watch-deployment.sh core-web test ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGOCD_JWT }}
 
   run-if-failed:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/docman.build.deploy.dev.yaml b/.github/workflows/docman.build.deploy.dev.yaml
@@ -45,10 +45,15 @@ jobs:
         uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4.7"
+      - name: Setup ArgoCD CLI
+        if: ${{ env.NEEDS_ROLLOUT=='true' }}
+        uses: imajeetyadav/argocd-cli@v1
+        with:
+          version: v2.7.8
       - name: oc login
         run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
       - name: Notification
-        run: ./gitops/watch-deployment.sh docman dev ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }}
+        run: ./gitops/watch-deployment.sh docman dev ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGOCD_JWT }}
 
   run-if-failed:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/docman.deploy.prod.yaml b/.github/workflows/docman.deploy.prod.yaml
@@ -41,10 +41,15 @@ jobs:
         uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4.7"
+      - name: Setup ArgoCD CLI
+        if: ${{ env.NEEDS_ROLLOUT=='true' }}
+        uses: imajeetyadav/argocd-cli@v1
+        with:
+          version: v2.7.8
       - name: oc login
         run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
       - name: Notification
-        run: ./gitops/watch-deployment.sh docman prod ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }}
+        run: ./gitops/watch-deployment.sh docman prod ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGOCD_JWT }}
 
   run-if-failed:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/docman.deploy.test.yaml b/.github/workflows/docman.deploy.test.yaml
@@ -41,10 +41,15 @@ jobs:
         uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4.7"
+      - name: Setup ArgoCD CLI
+        if: ${{ env.NEEDS_ROLLOUT=='true' }}
+        uses: imajeetyadav/argocd-cli@v1
+        with:
+          version: v2.7.8
       - name: oc login
         run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
       - name: Notification
-        run: ./gitops/watch-deployment.sh docman test ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }}
+        run: ./gitops/watch-deployment.sh docman test ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGOCD_JWT }}
 
   run-if-failed:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/filesystem-provider.build.deploy.dev.yaml b/.github/workflows/filesystem-provider.build.deploy.dev.yaml
@@ -50,10 +50,15 @@ jobs:
         uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4.7"
+      - name: Setup ArgoCD CLI
+        if: ${{ env.NEEDS_ROLLOUT=='true' }}
+        uses: imajeetyadav/argocd-cli@v1
+        with:
+          version: v2.7.8
       - name: oc login
         run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
       - name: Notification
-        run: ./gitops/watch-deployment.sh filesystem-provider dev ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }}
+        run: ./gitops/watch-deployment.sh filesystem-provider dev ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGOCD_JWT }}
 
   run-if-failed:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/filesystem-provider.deploy.prod.yaml b/.github/workflows/filesystem-provider.deploy.prod.yaml
@@ -41,10 +41,15 @@ jobs:
         uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4.7"
+      - name: Setup ArgoCD CLI
+        if: ${{ env.NEEDS_ROLLOUT=='true' }}
+        uses: imajeetyadav/argocd-cli@v1
+        with:
+          version: v2.7.8
       - name: oc login
         run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
       - name: Notification
-        run: ./gitops/watch-deployment.sh filesystem-provider prod ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }}
+        run: ./gitops/watch-deployment.sh filesystem-provider prod ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGOCD_JWT }}
 
   run-if-failed:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/filesystem-provider.deploy.test.yaml b/.github/workflows/filesystem-provider.deploy.test.yaml
@@ -41,10 +41,15 @@ jobs:
         uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4.7"
+      - name: Setup ArgoCD CLI
+        if: ${{ env.NEEDS_ROLLOUT=='true' }}
+        uses: imajeetyadav/argocd-cli@v1
+        with:
+          version: v2.7.8
       - name: oc login
         run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
       - name: Notification
-        run: ./gitops/watch-deployment.sh filesystem-provider test ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }}
+        run: ./gitops/watch-deployment.sh filesystem-provider test ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGOCD_JWT }}
 
   run-if-failed:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/minespace.build.deploy.dev.yaml b/.github/workflows/minespace.build.deploy.dev.yaml
@@ -50,10 +50,15 @@ jobs:
         uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4.7"
+      - name: Setup ArgoCD CLI
+        if: ${{ env.NEEDS_ROLLOUT=='true' }}
+        uses: imajeetyadav/argocd-cli@v1
+        with:
+          version: v2.7.8
       - name: oc login
         run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
       - name: Notification
-        run: ./gitops/watch-deployment.sh minespace dev ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }}
+        run: ./gitops/watch-deployment.sh minespace dev ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGOCD_JWT }}
 
   run-if-failed:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/minespace.deploy.prod.yaml b/.github/workflows/minespace.deploy.prod.yaml
@@ -41,10 +41,15 @@ jobs:
         uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4.7"
+      - name: Setup ArgoCD CLI
+        if: ${{ env.NEEDS_ROLLOUT=='true' }}
+        uses: imajeetyadav/argocd-cli@v1
+        with:
+          version: v2.7.8
       - name: oc login
         run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
       - name: Notification
-        run: ./gitops/watch-deployment.sh minespace prod ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }}
+        run: ./gitops/watch-deployment.sh minespace prod ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGOCD_JWT }}
 
   run-if-failed:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/minespace.deploy.test.yaml b/.github/workflows/minespace.deploy.test.yaml
@@ -42,12 +42,17 @@ jobs:
         uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4.7"
+      - name: Setup ArgoCD CLI
+        if: ${{ env.NEEDS_ROLLOUT=='true' }}
+        uses: imajeetyadav/argocd-cli@v1
+        with:
+          version: v2.7.8
       - name: oc login
         if: ${{ env.NEEDS_ROLLOUT=='true' }}
         run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
       - name: Notification
         if: ${{ env.NEEDS_ROLLOUT=='true' }}
-        run: ./gitops/watch-deployment.sh minespace test ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }}
+        run: ./gitops/watch-deployment.sh minespace test ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGOCD_JWT }}
 
   run-if-failed:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/nris.build.deploy.dev.yaml b/.github/workflows/nris.build.deploy.dev.yaml
@@ -45,10 +45,15 @@ jobs:
         uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4.7"
+      - name: Setup ArgoCD CLI
+        if: ${{ env.NEEDS_ROLLOUT=='true' }}
+        uses: imajeetyadav/argocd-cli@v1
+        with:
+          version: v2.7.8
       - name: oc login
         run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
       - name: Notification
-        run: ./gitops/watch-deployment.sh nris dev ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }}
+        run: ./gitops/watch-deployment.sh nris dev ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGOCD_JWT }}
 
   run-if-failed:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/nris.deploy.prod.yaml b/.github/workflows/nris.deploy.prod.yaml
@@ -41,10 +41,15 @@ jobs:
         uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4.7"
+      - name: Setup ArgoCD CLI
+        if: ${{ env.NEEDS_ROLLOUT=='true' }}
+        uses: imajeetyadav/argocd-cli@v1
+        with:
+          version: v2.7.8
       - name: oc login
         run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
       - name: Notification
-        run: ./gitops/watch-deployment.sh nris prod ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }}
+        run: ./gitops/watch-deployment.sh nris prod ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGOCD_JWT }}
 
   run-if-failed:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/nris.deploy.test.yaml b/.github/workflows/nris.deploy.test.yaml
@@ -41,10 +41,15 @@ jobs:
         uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4.7"
+      - name: Setup ArgoCD CLI
+        if: ${{ env.NEEDS_ROLLOUT=='true' }}
+        uses: imajeetyadav/argocd-cli@v1
+        with:
+          version: v2.7.8
       - name: oc login
         run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
       - name: Notification
-        run: ./gitops/watch-deployment.sh nris test ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }}
+        run: ./gitops/watch-deployment.sh nris test ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGOCD_JWT }}
 
   run-if-failed:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/tusd.build.deploy.dev.yaml b/.github/workflows/tusd.build.deploy.dev.yaml
@@ -46,10 +46,15 @@ jobs:
         uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4.7"
+      - name: Setup ArgoCD CLI
+        if: ${{ env.NEEDS_ROLLOUT=='true' }}
+        uses: imajeetyadav/argocd-cli@v1
+        with:
+          version: v2.7.8
       - name: oc login
         run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
       - name: Notification
-        run: ./gitops/watch-deployment.sh tusd dev ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }}
+        run: ./gitops/watch-deployment.sh tusd dev ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGOCD_JWT }}
 
   run-if-failed:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/tusd.deploy.prod.yaml b/.github/workflows/tusd.deploy.prod.yaml
@@ -40,10 +40,15 @@ jobs:
         uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4.7"
+      - name: Setup ArgoCD CLI
+        if: ${{ env.NEEDS_ROLLOUT=='true' }}
+        uses: imajeetyadav/argocd-cli@v1
+        with:
+          version: v2.7.8
       - name: oc login
         run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
       - name: Notification
-        run: ./gitops/watch-deployment.sh tusd prod ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }}
+        run: ./gitops/watch-deployment.sh tusd prod ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGOCD_JWT }}
 
   run-if-failed:
     runs-on: ubuntu-20.04

diff --git a/.github/workflows/tusd.deploy.test.yaml b/.github/workflows/tusd.deploy.test.yaml
@@ -40,10 +40,15 @@ jobs:
         uses: redhat-actions/openshift-tools-installer@v1
         with:
           oc: "4.7"
+      - name: Setup ArgoCD CLI
+        if: ${{ env.NEEDS_ROLLOUT=='true' }}
+        uses: imajeetyadav/argocd-cli@v1
+        with:
+          version: v2.7.8
       - name: oc login
         run: oc login --token=${{ secrets.BUILD_TOKEN }} --server=${{ secrets.CLUSTER_API }}
       - name: Notification
-        run: ./gitops/watch-deployment.sh tusd test ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }}
+        run: ./gitops/watch-deployment.sh tusd test ${{ github.sha }} ${{ secrets.DISCORD_DEPLOYMENT_WEBHOOK }} ${{ secrets.ARGOCD_SERVER }} ${{ secrets.ARGOCD_JWT }}
 
   run-if-failed:
     runs-on: ubuntu-20.04

diff --git a/gitops/watch-deployment.sh b/gitops/watch-deployment.sh
@@ -5,6 +5,8 @@ TARGET_APP=${1?"Enter App Name !"}
 ENV=${2?"Enter ENV Name !"}
 GIT_SHA=${3?"Enter GIT SHA of commit!"}
 DISCORD_DEPLOYMENT_WEBHOOK=${4?"Enter DISCORD_DEPLOYMENT_WEBHOOK!"}
+export ARGOCD_SERVER=${5?"Enter ARGOCD_SERVER!"}
+export ARGOCD_AUTH_TOKEN=${6?"Enter ARGOCD_AUTH_TOKEN!"}
 
 REPO_LOCATION=$(git rev-parse --show-toplevel)
 
@@ -22,13 +24,10 @@ echo "Current Revision of $TARGET_APP is $CURRENT_REVISION"
 
 echo -e "\n"
 echo "Watching for new revision of $TARGET_APP to be rolled out"
-echo "Polling to watch rollout to achieve the target revision of $TARGET_REVISION"
+echo "Waiting for $TARGET_APP to sync and be in healthy state"
 
-until [ $CURRENT_REVISION == $TARGET_REVISION ]; do
-    sleep 2
-    CURRENT_REVISION=$(get_revision)
-    echo "Refreshing the revision of $TARGET_APP, currently $CURRENT_REVISION, waiting for $TARGET_REVISION"
-done
+argocd app sync $TARGET_APP
+argocd app wait $TARGET_APP
 
 echo "Target Revision is achieved $CURRENT_REVISION"