From 582151a99a5e6b1e4100767d1d17a89f76af57dc Mon Sep 17 00:00:00 2001
From: dharmendra kumar <dharmendra.kumar@hmcts.net>
Date: Thu, 22 Jul 2021 11:01:09 +0100
Subject: [PATCH] refactor:move the files in different location

---
 Jenkinsfile_CNP                     | 9 ---------
 bin/build-release-ccd-definition.sh | 4 ++++
 bin/create-github-release.sh        | 2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/Jenkinsfile_CNP b/Jenkinsfile_CNP
index 2e4e996f3a..bddb91558a 100644
--- a/Jenkinsfile_CNP
+++ b/Jenkinsfile_CNP
@@ -53,9 +53,6 @@ def archiveCoreCaseDataDefinitions() {
 
       dir("${WORKSPACE}/build") {
         steps.archiveArtifacts artifacts: "ccd-release-config/civil-ccd-${PROD_ENV}.xlsx"
-        sh """
-           cp "ccd-release-config/civil-ccd-${PROD_ENV}.xlsx" "github-release/civil-ccd-${PROD_ENV}.xlsx"
-        """
       }
     }
 
@@ -69,9 +66,6 @@ def archiveCoreCaseDataDefinitions() {
 
     dir("${WORKSPACE}/build") {
       steps.archiveArtifacts artifacts: "ccd-release-config/civil-ccd-preview.xlsx"
-      sh """
-           cp "ccd-release-config/civil-ccd-preview.xlsx" "github-release/civil-ccd-preview.xlsx"
-      """
     }
   } else {
     dir("${WORKSPACE}/bin") {
@@ -83,9 +77,6 @@ def archiveCoreCaseDataDefinitions() {
 
     dir("${WORKSPACE}/build") {
       steps.archiveArtifacts artifacts: "ccd-release-config/civil-ccd-${env.ENVIRONMENT}.xlsx"
-      sh """
-          cp "ccd-release-config/civil-ccd-${env.ENVIRONMENT}.xlsx" "github-release/civil-ccd-${env.ENVIRONMENT}.xlsx"
-      """
     }
   }
 }
diff --git a/bin/build-release-ccd-definition.sh b/bin/build-release-ccd-definition.sh
index 23a8c77cac..593a47a3ae 100755
--- a/bin/build-release-ccd-definition.sh
+++ b/bin/build-release-ccd-definition.sh
@@ -17,9 +17,13 @@ fi
 root_dir=$(realpath $(dirname ${0})/..)
 config_dir=${root_dir}/ccd-definition
 build_dir=${root_dir}/build/ccd-release-config
+github_dir=${root_dir}/build/github-release
 release_definition_output_file=${build_dir}/civil-ccd-${environment}.xlsx
+github_file=${github_dir}/civil-ccd-${environment}.xlsx
 
 mkdir -p ${build_dir}
 
 # build the ccd definition file
 ${root_dir}/bin/utils/process-definition.sh ${config_dir} ${release_definition_output_file} "${excludedFilenamePatterns}"
+
+cp release_definition_output_file github_file
diff --git a/bin/create-github-release.sh b/bin/create-github-release.sh
index c3ab6c19a8..6c35c2dd86 100755
--- a/bin/create-github-release.sh
+++ b/bin/create-github-release.sh
@@ -48,9 +48,9 @@ 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
+ls -lash
 cp build/github-release/civil-ccd-aat.xlsx civil-ccd-aat.xlsx
 cp build/github-release/civil-ccd-prod.xlsx civil-ccd-prod.xlsx
-
 az login --identity
 releaseId=$(createNewRelease civil-ccd-definition)