Skip to content

Commit eb30c4e

Browse files
jrussettluan
authored andcommitted
Actually fix globbing
[Finishes #156210676](https://www.pivotaltracker.com/story/show/156210676) Signed-off-by: Luan Santos <lsantos@pivotal.io>
1 parent 61e2024 commit eb30c4e

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

jobs/acceptance-tests/templates/run.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ ${BOSH_BINARY_PATH} cloud-config > ${TEST_CLOUD_CONFIG_PATH}
2020

2121
source /var/vcap/packages/golang-1.8-linux/bosh/runtime.env
2222

23-
mkdir -p $GOPATH/src
24-
cp -R /var/vcap/packages/acceptance-tests/src/bosh-dns $GOPATH/src/bosh-dns
23+
mkdir -p $GOPATH/src/bosh-dns
24+
cp -R /var/vcap/packages/acceptance-tests/src/bosh-dns/. $GOPATH/src/bosh-dns/
2525

2626
go install bosh-dns/vendor/github.com/onsi/ginkgo/ginkgo
2727

packages/acceptance-tests/spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies: []
66
files:
77
- bosh-dns/acceptance_tests/**/*
88
- bosh-dns/healthcheck/healthclient/*
9-
- bosh-dns/test_yml_assets/*
9+
- bosh-dns/test_yml_assets/**/*
1010
- bosh-dns/vendor/**/*
1111
- bosh-cli/bosh-cli-2.0.16-linux-amd64
1212

scripts/test-acceptance-windows

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
set -e -o pipefail
44
set -x
5+
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
56

67
clean_up() {
7-
fly -t production execute -x --privileged \
8+
fly -t production execute --privileged \
89
--config=$DIR/../ci/tasks/clean-up.yml \
910
--inputs-from=bosh-dns-release/test-acceptance-windows
1011
}
1112

1213
trap "clean_up" EXIT
1314

1415
main() {
15-
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
1616
tarball_dir=$(mktemp -d)
1717
bosh create-release --force --tarball=${tarball_dir}/bosh-windows-dns-release.tgz
1818
pushd $tarball_dir
@@ -21,27 +21,26 @@ main() {
2121

2222
echo "### starting windows-specific tests..."
2323
# windows specfic
24-
fly -t production execute -x --privileged \
24+
fly -t production execute --privileged \
2525
--config=$DIR/../ci/tasks/test-acceptance-windows.yml \
2626
--inputs-from=bosh-dns-release/test-acceptance-windows \
2727
--input=bosh-dns-release=$DIR/../ \
2828
--input=candidate-release=${tarball_dir}
2929

3030
# nameserver-disabled
3131
echo "### tests: nameserver-disabled"
32-
fly -t production execute -x --privileged \
32+
fly -t production execute --privileged \
3333
--config=$DIR/../ci/tasks/test-acceptance-windows-nameserver-disabled.yml \
3434
--inputs-from=bosh-dns-release/test-acceptance-windows \
3535
--input=bosh-dns-release=$DIR/../
3636

3737
# shared
3838
echo "### tests: shared"
39-
fly -t production execute -x --privileged \
39+
fly -t production execute --privileged \
4040
--config=$DIR/../ci/tasks/test-acceptance-windows-shared.yml \
4141
--inputs-from=bosh-dns-release/test-acceptance-windows \
4242
--input=bosh-dns-release=$DIR/../ \
4343
--input=candidate-release=${tarball_dir}
44-
4544
}
4645

4746
main $@

0 commit comments

Comments
 (0)