Merge pull request #351 from bingosummer/azure-storage-ruby

Use azure-core-0.1.12
cloudfoundry · Dec 18, 2017 · 70cc5bd · 70cc5bd
2 parents 4bd8c38 + a39dd6b
commit 70cc5bd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/ci/tasks/ensure-cleanup.sh b/ci/tasks/ensure-cleanup.sh
@@ -14,7 +14,12 @@ az cloud set --name ${AZURE_ENVIRONMENT}
 az login --service-principal -u ${AZURE_CLIENT_ID} -p ${AZURE_CLIENT_SECRET} --tenant ${AZURE_TENANT_ID}
 az account set -s ${AZURE_SUBSCRIPTION_ID}
 
-set +e
+# In most cases, terraform can destroy the environment successfully
+if [ ! -f ${METADATA_FILE} ]; then
+  echo "The environment has been destroyed. Exit 0."
+  exit 0
+fi
+
 metadata=$(cat ${METADATA_FILE})
 
 integration_additional_resource_group_name=$(echo ${metadata} | jq -e --raw-output ".additional_resource_group_name")

diff --git a/src/bosh_azure_cpi/Gemfile.lock b/src/bosh_azure_cpi/Gemfile.lock
@@ -3,7 +3,7 @@ GEM
   specs:
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    azure-core (0.1.13)
+    azure-core (0.1.12)
       faraday (~> 0.9)
       faraday_middleware (~> 0.10)
       nokogiri (~> 1.6)

diff --git a/src/bosh_azure_cpi/vendor/package/azure-core-0.1.12.gem b/src/bosh_azure_cpi/vendor/package/azure-core-0.1.12.gem
diff --git a/src/bosh_azure_cpi/vendor/package/azure-core-0.1.13.gem b/src/bosh_azure_cpi/vendor/package/azure-core-0.1.13.gem