System test improvement: sources fly update in test setup script

EngineerBetter · Apr 16, 2020 · 84fb83c · 84fb83c
1 parent 1ef90dc
commit 84fb83c
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 17 deletions.
diff --git a/ci/tasks/lib/manifest_property.sh b/ci/tasks/lib/manifest_property.sh
@@ -3,6 +3,7 @@
 # Takes two arguments- path and value
 # Checks if path=value in the Bosh manifest for 'concourse' deployment
 function checkManifestProperty() {
+  echo "About to test a property in the Bosh manifest"
   # Checks if exactly two arguments were passed to the function
   # shellcheck disable=SC2086
   : ${2?"Usage: manifestProperty PATH VALUE"}
@@ -13,4 +14,5 @@ function checkManifestProperty() {
     echo "Error: Wants '${path}: ${expected_value}', got '${path}: ${actual_value}'"
     exit 1
   fi
+  echo "Manifest property test passed"
 }
diff --git a/ci/tasks/lib/test-setup.sh b/ci/tasks/lib/test-setup.sh
@@ -12,3 +12,4 @@ source control-tower/ci/tasks/lib/trap.sh
 source control-tower/ci/tasks/lib/credhub.sh
 source control-tower/ci/tasks/lib/grafana.sh
 source control-tower/ci/tasks/lib/domain.sh
+source control-tower/ci/tasks/lib/update-fly.sh
diff --git a/ci/tasks/system-test-letsencrypt.sh b/ci/tasks/system-test-letsencrypt.sh
@@ -6,9 +6,6 @@ source control-tower/ci/tasks/lib/test-setup.sh
 # shellcheck disable=SC1091
 source control-tower/ci/tasks/lib/letsencrypt.sh
 
-# shellcheck disable=SC1091
-source control-tower/ci/tasks/lib/update-fly.sh
-
 
 handleVerboseMode
 

diff --git a/ci/tasks/system-test-m5.sh b/ci/tasks/system-test-m5.sh
@@ -3,9 +3,6 @@
 # shellcheck disable=SC1091
 source control-tower/ci/tasks/lib/test-setup.sh
 
-# shellcheck disable=SC1091
-source control-tower/ci/tasks/lib/update-fly.sh
-
 handleVerboseMode
 setDeploymentName region
 

diff --git a/ci/tasks/system-test-options-and-destroy.sh b/ci/tasks/system-test-options-and-destroy.sh
@@ -19,8 +19,6 @@ source control-tower/ci/tasks/lib/assert-iaas.sh
 # shellcheck disable=SC1091
 source control-tower/ci/tasks/lib/check-cidr-ranges.sh
 # shellcheck disable=SC1091
-source control-tower/ci/tasks/lib/update-fly.sh
-# shellcheck disable=SC1091
 source control-tower/ci/tasks/lib/manifest_property.sh
 
 # shellcheck disable=SC1091
@@ -66,7 +64,7 @@ assertTagsSet
 assertGitHubAuthConfigured
 
 # Check Concourse global resources is disabled (as it should be by default)
-info_output="$(./cup info --env "$deployment")"
+info_output="$(./cup info --region "$region" --env "$deployment")"
 eval "$info_output"
 global_resources_path="/instance_groups/name=web/jobs/name=web/properties/enable_global_resources"
 checkManifestProperty "${global_resources_path}" false

diff --git a/ci/tasks/system-test-rds-ca.sh b/ci/tasks/system-test-rds-ca.sh
@@ -5,9 +5,6 @@ source control-tower/ci/tasks/lib/test-setup.sh
 # shellcheck disable=SC1091
 source control-tower/ci/tasks/lib/check-cidr-ranges.sh
 
-# shellcheck disable=SC1091
-source control-tower/ci/tasks/lib/update-fly.sh
-
 handleVerboseMode
 
 setDeploymentName rdsca

diff --git a/ci/tasks/system-test-update.sh b/ci/tasks/system-test-update.sh
@@ -8,9 +8,6 @@ source control-tower/ci/tasks/lib/test-setup.sh
 # shellcheck disable=SC1091
 source control-tower/ci/tasks/lib/check-cidr-ranges.sh
 
-# shellcheck disable=SC1091
-source control-tower/ci/tasks/lib/update-fly.sh
-
 handleVerboseMode
 
 setDeploymentName upt

diff --git a/ci/tasks/system-test.sh b/ci/tasks/system-test.sh
@@ -14,8 +14,6 @@ source control-tower/ci/tasks/lib/check-db.sh
 source control-tower/ci/tasks/lib/check-cidr-ranges.sh
 # shellcheck disable=SC1091
 source control-tower/ci/tasks/lib/manifest_property.sh
-# shellcheck disable=SC1091
-source control-tower/ci/tasks/lib/update-fly.sh
 
 trapDefaultCleanup