Makes ci/system.yml easier to reuse

[#131726841]

Signed-off-by: Jatin Naik <[email protected]>

Makefile

@@ -1,7 +1,5 @@
 export BOSH_CLIENT=admin
 export BOSH_GATEWAY_USER=vcap
-export BOSH_URL=https://lite-bosh.backup-and-restore.cf-app.com
-export BOSH_GATEWAY_HOST=lite-bosh.backup-and-restore.cf-app.com
 
 test: test-unit test-integration
 
@@ -54,6 +52,8 @@ setup:
 	go get -u github.com/onsi/ginkgo/ginkgo
 
 sys-test-local:
+	BOSH_URL=https://lite-bosh.backup-and-restore.cf-app.com \
+	BOSH_GATEWAY_HOST=lite-bosh.backup-and-restore.cf-app.com \
 	BOSH_CLIENT_SECRET=`lpass show LiteBoshDirector --password` \
 	BOSH_CERT_PATH=~/workspace/bosh-backup-and-restore-meta/certs/lite-bosh.backup-and-restore.cf-app.com.crt \
 	BOSH_GATEWAY_KEY=~/workspace/bosh-backup-and-restore-meta/genesis-bosh/bosh.pem \

ci/scripts/system.sh

@@ -7,9 +7,11 @@ eval "$(ssh-agent)"
 chmod 400 bosh-backup-and-restore-meta/keys/github
 chmod 400 bosh-backup-and-restore-meta/genesis-bosh/bosh.pem
 ssh-add bosh-backup-and-restore-meta/keys/github
+export BOSH_GATEWAY_HOST=$BOSH_HOST
+export BOSH_URL=https://$BOSH_HOST
 export GOPATH=$PWD
 export PATH=$PATH:$GOPATH/bin
-export BOSH_CERT_PATH=`pwd`/bosh-backup-and-restore-meta/certs/lite-bosh.backup-and-restore.cf-app.com.crt
+export BOSH_CERT_PATH=`pwd`/bosh-backup-and-restore-meta/certs/$BOSH_HOST.crt
 export BOSH_GATEWAY_KEY=`pwd`/bosh-backup-and-restore-meta/genesis-bosh/bosh.pem
 
 cd src/github.com/pivotal-cf/bosh-backup-and-restore

ci/tasks/system.yml

@@ -12,7 +12,7 @@ inputs:
 
 params:
   BOSH_CLIENT_SECRET:
-  BOSH_URL:
+  BOSH_HOST:
   TEAM_GPG_KEY:
 run:
   path: src/github.com/pivotal-cf/bosh-backup-and-restore/ci/scripts/system.sh