From a615978d92c8850ba99e4833f03dac09e51613d0 Mon Sep 17 00:00:00 2001 From: Colin Simmons Date: Fri, 6 Sep 2019 14:49:19 +0100 Subject: [PATCH] fix delegation test Signed-off-by: Colin Simmons --- ci/tasks/system-test-zone-delegation.sh | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/ci/tasks/system-test-zone-delegation.sh b/ci/tasks/system-test-zone-delegation.sh index 4f1d8f907..84144b540 100755 --- a/ci/tasks/system-test-zone-delegation.sh +++ b/ci/tasks/system-test-zone-delegation.sh @@ -9,13 +9,9 @@ setDeploymentName del # Create empty array of args that is used in sourced setup functions args=() # shellcheck disable=SC1091 -source control-tower/ci/tasks/lib/assert-iaas.sh - -# shellcheck disable=SC1091 -[ "$IAAS" = "AWS" ] && { source control-tower/ci/tasks/lib/destroy.sh; } - +source control-tower/ci/tasks/lib/letsencrypt.sh # shellcheck disable=SC1091 -[ "$IAAS" = "GCP" ] && { source control-tower/ci/tasks/lib/gcp-destroy.sh; } +source control-tower/ci/tasks/lib/assert-iaas.sh cp "$BINARY_PATH" ./cup chmod +x ./cup @@ -41,8 +37,7 @@ sleep 60 assertConcoursePresent assertGrafanaPresent -recordDeployedState +echo "Tests passed" + echo "non-interactive destroy" ./cup --non-interactive destroy "$deployment" -iaas "$IAAS" -sleep 180 -assertEverythingDeleted