From d1de74b49a30cc331717f9630b8cdeb249673236 Mon Sep 17 00:00:00 2001
From: Aaron Forde <aaron.forde@aot-technologies.com>
Date: Wed, 2 Aug 2023 14:34:53 -0700
Subject: [PATCH] more changes to deploy.yaml

---
 .github/workflows/deploy.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 8fb6840a7..9ca1d90ab 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -18,13 +18,15 @@ defaults:
     working-directory: ./openshift
 
 env:
-
+  TAG_NAME: "test"
   PROJECT_TYPE: "${{ github.event.inputs.project_type || 'GDX' }}" # If the project type is manually selected, use the input value; otherwise, use 'GDX' as default
+  oc project ${{ env.OPENSHIFT_REPOSITORY}}-tools
 
  # Set OpenShift related variables based on PROJECT_TYPE
   OPENSHIFT_LOGIN_REGISTRY: ${{ secrets.OPENSHIFT_LOGIN_REGISTRY }}
   OPENSHIFT_SA_TOKEN: ${{ (github.event.inputs.project_type == 'EAO') && secrets.OPENSHIFT_SA_TOKEN_EAO || secrets.OPENSHIFT_SA_TOKEN }}
- 
+  OPENSHIFT_REPOSITORY: ${{ (github.event.inputs.project_type == 'EAO') && secrets.OPENSHIFT_REPOSITORY_EAO || secrets.OPENSHIFT_REPOSITORY }}
+
 jobs:
   met-deployment:
     runs-on: ubuntu-20.04
@@ -41,4 +43,7 @@ jobs:
       - name: Tag Images and Rollout
         shell: bash
         run: |
-          sh deploy.sh ${{ github.event.inputs.environment }}
\ No newline at end of file
+          oc project ${{ env.OPENSHIFT_REPOSITORY}}-tools \
+          sh deploy.sh ${{ github.event.inputs.environment }} \
+          oc rollout status dc/met-api -n ${{ env.OPENSHIFT_REPOSITORY }}-${{ env.TAG_NAME }} -w
+          oc rollout status dc/met-web -n ${{ env.OPENSHIFT_REPOSITORY }}-${{ env.TAG_NAME }} -w