Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions jobs/backup-restore-notifications/spec
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ properties:
description: 'Client id of the UAA'
notifications.uaa.client_secret:
description: 'Client secret of the UAA'
notifications.cli_path:
description: 'path where the cli binary is stored'
default: /var/vcap/packages/cf-cli-8-linux/bin
ssl.skip_cert_verify:
description: 'Whether to verify SSL certs when making HTTP and SMTP requests'
notifications.bbr.metadata:
Expand Down
2 changes: 1 addition & 1 deletion jobs/backup-restore-notifications/templates/common.sh.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -ex

PATH="/var/vcap/packages/cf-cli-8-linux/bin:$PATH"
PATH="<%= properties.notifications.cli_path %>:$PATH"

SCHEME="https"
DOMAIN="<%= properties.domain %>"
Expand Down
5 changes: 4 additions & 1 deletion jobs/deploy-notifications/spec
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,7 @@ properties:
description: 'External log service URL'
notifications.error_on_misconfiguration:
description: 'Throw error on service misconfiguration during deployment'
default: true
default: true
notifications.cli_path:
description: 'path where the cli binary is stored'
default: /var/vcap/packages/cf-cli-8-linux/bin
2 changes: 1 addition & 1 deletion jobs/deploy-notifications/templates/deploy.sh.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash -exu

export PATH="/var/vcap/packages/cf-cli-8-linux/bin:/var/vcap/packages/notifications-jq/bin:$PATH"
export PATH="<%= properties.notifications.cli_path %>:/var/vcap/packages/notifications-jq/bin:$PATH"
export CF_HOME="/var/vcap/data/deploy-notifications/cf-home"
export CF_DIAL_TIMEOUT=<%= properties.notifications.cf.dial_timeout %>

Expand Down
3 changes: 3 additions & 0 deletions jobs/destroy-notifications/spec
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,8 @@ properties:
description: 'Organization where the app is deployed'
notifications.space:
description: 'Space where the app is deployed'
notifications.cli_path:
description: 'path where the cli binary is stored'
default: /var/vcap/packages/cf-cli-8-linux/bin
ssl.skip_cert_verify:
description: 'Whether to verify SSL certs when making HTTP and SMTP requests'
2 changes: 1 addition & 1 deletion jobs/destroy-notifications/templates/destroy.sh.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash -ex

export PATH="/var/vcap/packages/cf-cli-8-linux/bin:$PATH"
export PATH="<%= properties.notifications.cli_path %>:$PATH"
export CF_HOME=/var/vcap/data/destroy-notifications/tmp/cf-home
export CF_DIAL_TIMEOUT=<%= properties.notifications.cf.dial_timeout %>

Expand Down
3 changes: 3 additions & 0 deletions jobs/test-notifications/spec
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,6 @@ properties:
description: 'Space that contains the app'
notifications.tests.performance:
description: 'Toggle for running the performance tests'
notifications.cli_path:
description: 'path where the cli binary is stored'
default: /var/vcap/packages/cf-cli-8-linux/bin
2 changes: 1 addition & 1 deletion jobs/test-notifications/templates/test.sh.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pushd /var/vcap/packages/acceptance

export TMPDIR=${TMPDIR:-/tmp}
echo TMPDIR=${TMPDIR}
export PATH=$PATH:/var/vcap/packages/cf-cli-8-linux/bin
export PATH=$PATH:<%= properties.notifications.cli_path %>
export HOME=${TMPDIR}/home
export CF_HOME=${TMPDIR}/cf-home
export GOTMPDIR=${TMPDIR}/go/
Expand Down
Loading