diff --git a/ci/tasks/windows/setup-deploy.sh b/ci/tasks/windows/setup-deploy.sh index 59fcc7fb0..65cc9348a 100755 --- a/ci/tasks/windows/setup-deploy.sh +++ b/ci/tasks/windows/setup-deploy.sh @@ -15,6 +15,11 @@ main() { bosh upload-release $ROOT_DIR/candidate-release/*.tgz bosh -n upload-stemcell $ROOT_DIR/bosh-stemcell-windows/*.tgz bosh -n upload-stemcell $ROOT_DIR/gcp-linux-stemcell/*.tgz + + # Need to delete the bosh-dns runtime config because bbl uses a hard-coded + # bosh-deployment which specifies a bosh-dns version that may conflict with the + # one we are trying to test. + bosh delete-config --type=runtime --name=dns -n } main diff --git a/ci/tasks/windows/test-acceptance-windows.sh b/ci/tasks/windows/test-acceptance-windows.sh index 081084c02..2fe289bdf 100755 --- a/ci/tasks/windows/test-acceptance-windows.sh +++ b/ci/tasks/windows/test-acceptance-windows.sh @@ -11,11 +11,6 @@ popd export BOSH_DEPLOYMENT=bosh-dns-windows-acceptance -# Need to delete the bosh-dns runtime config because bbl uses a hard-coded -# bosh-deployment which specifies a bosh-dns version that may conflict with the -# one we are trying to test. -bosh delete-config --type=runtime --name=bosh-dns -n - bosh -n deploy \ $ROOT_DIR/bosh-dns-release/src/bosh-dns/test_yml_assets/manifests/windows-acceptance-manifest.yml \ -v deployment_name="$BOSH_DEPLOYMENT" \