From de2e30fae20504c40603e72c987656c8be046116 Mon Sep 17 00:00:00 2001 From: Giuseppe Capizzi Date: Wed, 15 Mar 2017 15:57:12 +0000 Subject: [PATCH] Makes ci/system.yml easier to reuse [#131726841] Signed-off-by: Jatin Naik --- Makefile | 4 ++-- ci/scripts/system.sh | 4 +++- ci/tasks/system.yml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ae27bf43c..223538a66 100644 --- a/Makefile +++ b/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 \ diff --git a/ci/scripts/system.sh b/ci/scripts/system.sh index 4f13d182d..f55bb619f 100755 --- a/ci/scripts/system.sh +++ b/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 diff --git a/ci/tasks/system.yml b/ci/tasks/system.yml index 2f34c7894..93ef66fb3 100644 --- a/ci/tasks/system.yml +++ b/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