From 39a017962c3338594ca0170f54c7ca6a9d6f30db Mon Sep 17 00:00:00 2001
From: Kuan Fan <kuan.fan@gov.bc.ca>
Date: Tue, 6 Oct 2020 11:32:52 -0700
Subject: [PATCH] update ocpName

---
 .jenkins/.pipeline/lib/deploy.js | 2 +-
 .pipeline/lib/config.js          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.jenkins/.pipeline/lib/deploy.js b/.jenkins/.pipeline/lib/deploy.js
index 076f8db1f..f992d7d26 100755
--- a/.jenkins/.pipeline/lib/deploy.js
+++ b/.jenkins/.pipeline/lib/deploy.js
@@ -18,7 +18,7 @@ module.exports = (settings)=>{
       'SUFFIX': phases[phase].suffix,
       'VERSION': phases[phase].tag,
       'ENV_NAME': phases[phase].phase,
-      'ROUTE_HOST': `${phases[phase].name}${phases[phase].suffix}-${phases[phase].namespace}.${ocpName}.gov.bc.ca`
+      'ROUTE_HOST': `${phases[phase].name}${phases[phase].suffix}-${phases[phase].namespace}.${phases[phase].ocpName}.gov.bc.ca`
     }
   }))
 
diff --git a/.pipeline/lib/config.js b/.pipeline/lib/config.js
index e2d791429..21de91778 100644
--- a/.pipeline/lib/config.js
+++ b/.pipeline/lib/config.js
@@ -25,7 +25,7 @@ const phases = {
   test: {namespace:'tbiwaq-test', name: `${name}`, ssoSuffix:'-test', 
         ssoName:'sso-test', phase: 'test'  ,  changeId:`${changeId}`, suffix: `-test`, 
         instance: `${name}-test`, version:`${version}`, tag:`test-${version}`, 
-        host: 'zeva-test.${ocpName}.gov.bc.ca', djangoDebug: 'False',
+        host: `zeva-test.${ocpName}.gov.bc.ca`, djangoDebug: 'False',
         frontendCpuRequest: '300m', frontendCpuLimit: '600m', frontendMemoryRequest: '500M', frontendMemoryLimit: '1G', frontendReplicas: 2, frontendMinReplicas: 2, frontendMaxReplicas: 5,
         backendCpuRequest: '100m', backendCpuLimit: '500m', backendMemoryRequest: '500M', backendMemoryLimit: '700M', backendHealthCheckDelay: 30, backendReplicas: 1, backendMinReplicas: 2, backendMaxReplicas: 5, backendHost: `zeva-backend-test.${ocpName}.gov.bc.ca`,
         minioCpuRequest: '100m', minioCpuLimit: '300m', minioMemoryRequest: '500M', minioMemoryLimit: '700M', minioPvcSize: '5G',
@@ -36,7 +36,7 @@ const phases = {
   prod: {namespace:'tbiwaq-prod', name: `${name}`, ssoSuffix:'', 
         ssoName:'sso', phase: 'prod'  , changeId:`${changeId}`, suffix: `-prod`, 
         instance: `${name}-prod`, version:`${version}`, tag:`prod-${version}`, 
-        host: 'zeroemissionvehicles.${ocpName}.gov.bc.ca', djangoDebug: 'False',
+        host: `zeroemissionvehicles.${ocpName}.gov.bc.ca`, djangoDebug: 'False',
         frontendCpuRequest: '300m', frontendCpuLimit: '600m', frontendMemoryRequest: '1G', frontendMemoryLimit: '2G', frontendReplicas: 2, frontendMinReplicas: 2, frontendMaxReplicas: 5,
         backendCpuRequest: '200m', backendCpuLimit: '700m', backendMemoryRequest: '1G', backendMemoryLimit: '2G', backendHealthCheckDelay: 30, backendReplicas: 1, backendMinReplicas: 2, backendMaxReplicas: 5, backendHost: `zeva-backend-prod.${ocpName}.gov.bc.ca`,
         minioCpuRequest: '100m', minioCpuLimit: '300m', minioMemoryRequest: '500M', minioMemoryLimit: '700M', minioPvcSize: '10G',