From afc04c9a6f63d61eec470872558652e972067791 Mon Sep 17 00:00:00 2001
From: Warren Christian
 <70002196+warrenchristian1telus@users.noreply.github.com>
Date: Wed, 18 Dec 2024 15:29:42 -0800
Subject: [PATCH] Removed DEPLOY_ENVIRONMENT from redis-proxy.yml process

---
 .github/workflows/deploy.yml         | 2 +-
 .github/workflows/redis-proxy.yml    | 2 +-
 openshift/scripts/deploy-template.sh | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 78724df..14a1dd4 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -199,7 +199,7 @@ jobs:
           DEPLOY_NAMESPACE: ${{ inputs.DEPLOY_NAMESPACE }}
           WEB_DEPLOYMENT_NAME: ${{ inputs.WEB_DEPLOYMENT_NAME }}
           WEB_IMAGE: ${{ secrets.ARTIFACTORY_URL }}/${{ inputs.WEB_IMAGE }}
-          REDIS_PROXY_IMAGE: ${{ secrets.ARTIFACTORY_URL }}/${{ inputs.REDIS_PROXY_NAME }}:${{ inputs.BUILD_TAG }}
+          REDIS_PROXY_IMAGE: ${{ secrets.ARTIFACTORY_URL }}/${{ inputs.REDIS_PROXY_NAME }}:${{ inputs.OPENSHIFT_DEPLOY_PROJECT }}-${{ github.ref_name }}
           PHP_DEPLOYMENT_NAME: ${{ inputs.PHP_DEPLOYMENT_NAME }}
           DB_DEPLOYMENT_NAME: ${{ inputs.DB_DEPLOYMENT_NAME }}
           CRON_NAME: ${{ inputs.CRON_NAME }}
diff --git a/.github/workflows/redis-proxy.yml b/.github/workflows/redis-proxy.yml
index 6485a4f..26bd381 100644
--- a/.github/workflows/redis-proxy.yml
+++ b/.github/workflows/redis-proxy.yml
@@ -1,7 +1,7 @@
 name: Redis
 
 concurrency:
-  group: redis-proxy-${{ github.workflow }}-${{ github.ref }}
+  group: redis-${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: false
 
 env:
diff --git a/openshift/scripts/deploy-template.sh b/openshift/scripts/deploy-template.sh
index cd1bb6c..6df69f8 100644
--- a/openshift/scripts/deploy-template.sh
+++ b/openshift/scripts/deploy-template.sh
@@ -153,7 +153,6 @@ sleep 10
 echo "Deploy redis-proxy..."
 oc process -f ./openshift/redis-proxy.yml \
   -p DEPLOY_IMAGE=$REDIS_PROXY_IMAGE \
-  -p DEPLOY_ENVIRONMENT=$DEPLOY_ENVIRONMENT \
   | oc create -f -
 
 sleep 10