Removing unnecessary steps.

Signed-off-by: Kallol Roy <kallol.roy@progress.com>

.expeditor/automate_build.sh

@@ -4,7 +4,6 @@ export ORIGIN=chef
 export HAB_ORIGIN=chef
 export HAB_LICENSE=accept-no-persist
 export OCTOKIT_ACCESS_TOKEN
-export HAB_LICENSE=accept
 export CHEF_LICENSE="accept-no-persist"
 export CI=true
 export HAB_ORIGIN_KEYS=chef
@@ -36,19 +35,16 @@ echo "generating package for nginx"
 openresty_hart=$(ls -1t results/chef-openresty*.hart | head -1)
 HAB_FEAT_OFFLINE_INSTALL=true HAB_FEAT_IGNORE_LOCAL=false HAB_ORIGIN=chef HAB_CACHE_KEY_PATH="$JOB_TEMP_ROOT/keys" DO_CHECK=true HAB_BLDR_CHANNEL=dev hab studio run -D "set -e; hab pkg install $openresty_hart; hab pkg build src/nginx"
 
-cp $HAB_CACHE_KEY_PATH/* results
-# tar -cvf results.tar results
-# gzip results.tar
-# buildkite-agent artifact upload results.tar.gz
-
 git clone https://github.com/chef/automate.git
 cd automate
 git checkout vikas/cs-changes-for-pipeline
 
 RESOLVED_RESULTS_DIR=$(realpath results/)
 export DO_CHECK=true
 
-cp ../results/*.hart ../results/chef*.pub ../results/chef*.key results
+cp ../results/*.hart $HAB_CACHE_KEY_PATH/* results
+
+#cp ../results/*.hart ../results/chef*.pub ../results/chef*.key results
 ../.expeditor/replace.sh
 bookshelf_hart=$(ls -1t results/chef-bookshelf*.hart | head -1)
 chef_server_ctl_hart=$(ls -1t results/chef-chef-server-ctl*.hart | head -1)

.expeditor/replace.sh

@@ -67,14 +67,11 @@ do
     fi
   done
   cp $tmp_file $plan_file
-  rm $tmp_file "${tmp_file}tmp"
+  rm $tmp_file
   echo "=================================="
   echo "file content after replace"
   cat $plan_file
   echo "=================================="
-  echo "results dir content"
-  ls results/*.hart
-  echo "=================================="
 done
 
 exit 0