refactor:correct the publish release

hmcts · Jul 21, 2021 · 34d93b9 · 34d93b9
1 parent c267cea
commit 34d93b9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP
@@ -70,8 +70,8 @@ def archiveCoreCaseDataDefinitions() {
   } else {
     dir("${WORKSPACE}/bin") {
       sh """
-          eval \$(./variables/load-${ENVIRONMENT}-environment-variables.sh)
-          ./build-release-ccd-definition.sh ${ENVIRONMENT}
+          eval \$(./variables/load-${env.ENVIRONMENT}-environment-variables.sh)
+          ./build-release-ccd-definition.sh ${env.ENVIRONMENT}
         """
     }
 

diff --git a/bin/create-github-release.sh b/bin/create-github-release.sh
@@ -48,8 +48,8 @@ fi
 zip -r civil-ccd-definition.zip ccd-definition
 zip -r civil-e2e.zip e2e codecept.conf.js package.json steps.d.ts yarn.lock saucelabs.conf.js
 zip -r civil-screenshots.zip output
-cp build/ccd-release-config/civil-ccd-aat.xlsx civil-ccd-aat.xlsx
-cp build/ccd-release-config/civil-ccd-prod.xlsx civil-ccd-prod.xlsx
+cp ccd-release-config/civil-ccd-aat.xlsx civil-ccd-aat.xlsx
+cp ccd-release-config/civil-ccd-prod.xlsx civil-ccd-prod.xlsx
 
 az login --identity
 releaseId=$(createNewRelease civil-ccd-definition)

diff --git a/bin/variables/load-aat-environment-variables.sh b/bin/variables/load-aat-environment-variables.sh
@@ -2,5 +2,4 @@
 
 set -eu
 
-echo 'export ENVIRONMENT=aat'
 echo "export CCD_DEF_CASE_SERVICE_BASE_URL=http://civil-service-aat.service.core-compute-aat.internal"
diff --git a/bin/variables/load-prod-environment-variables.sh b/bin/variables/load-prod-environment-variables.sh
@@ -2,5 +2,4 @@
 
 set -eu
 
-echo 'export ENVIRONMENT=prod'
 echo "export CCD_DEF_CASE_SERVICE_BASE_URL=http://civil-service-prod.service.core-compute-prod.internal"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,5 +2,4 @@

		set -eu

		echo 'export ENVIRONMENT=aat'
		echo "export CCD_DEF_CASE_SERVICE_BASE_URL=http://civil-service-aat.service.core-compute-aat.internal"