Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support multiple resource group for VM resources #286

Merged
merged 1 commit into from
Jul 7, 2017
Merged

Support multiple resource group for VM resources #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions ci/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ jobs:
AZURE_CLIENT_ID: {{azure_client_id}}
AZURE_CLIENT_SECRET: {{azure_client_secret}}
AZURE_TENANT_ID: {{azure_tenant_id}}
AZURE_GROUP_NAME_FOR_VMS: {{azure_group_name_for_vms}}
AZURE_GROUP_NAME_FOR_NETWORK: {{azure_group_name_for_network}}
AZURE_GROUP_NAME_FOR_VMS_MANAGED_DISKS: {{azure_group_name_for_vms_managed_disks}}
AZURE_GROUP_NAME_FOR_NETWORK_MANAGED_DISKS: {{azure_group_name_for_network_managed_disks}}
AZURE_GROUP_NAME_FOR_VMS_CENTOS: {{azure_group_name_for_vms_centos}}
AZURE_GROUP_NAME_FOR_NETWORK_CENTOS: {{azure_group_name_for_network_centos}}
AZURE_DEFAULT_GROUP_NAME: {{azure_default_group_name}}
AZURE_ADDITIONAL_GROUP_NAME: {{azure_additional_group_name}}
AZURE_DEFAULT_GROUP_NAME_MANAGED_DISKS: {{azure_default_group_name_managed_disks}}
AZURE_ADDITIONAL_GROUP_NAME_MANAGED_DISKS: {{azure_additional_group_name_managed_disks}}
AZURE_DEFAULT_GROUP_NAME_CENTOS: {{azure_default_group_name_centos}}
AZURE_ADDITIONAL_GROUP_NAME_CENTOS: {{azure_additional_group_name_centos}}
AZURE_REGION_NAME: {{azure_region_name}}
AZURE_VNET_NAME_FOR_BATS: {{azure_vnet_name_for_bats}}
AZURE_VNET_NAME_FOR_LIFECYCLE: {{azure_vnet_name_for_lifecycle}}
Expand All @@ -52,12 +52,12 @@ jobs:
AZURE_TENANT_ID: {{azure_tenant_id}}
AZURE_CLIENT_ID: {{azure_client_id}}
AZURE_CLIENT_SECRET: {{azure_client_secret}}
AZURE_GROUP_NAME_FOR_VMS: {{azure_group_name_for_vms}}
AZURE_GROUP_NAME_FOR_NETWORK: {{azure_group_name_for_network}}
AZURE_GROUP_NAME_FOR_VMS_MANAGED_DISKS: {{azure_group_name_for_vms_managed_disks}}
AZURE_GROUP_NAME_FOR_NETWORK_MANAGED_DISKS: {{azure_group_name_for_network_managed_disks}}
AZURE_GROUP_NAME_FOR_VMS_CENTOS: {{azure_group_name_for_vms_centos}}
AZURE_GROUP_NAME_FOR_NETWORK_CENTOS: {{azure_group_name_for_network_centos}}
AZURE_DEFAULT_GROUP_NAME: {{azure_default_group_name}}
AZURE_ADDITIONAL_GROUP_NAME: {{azure_additional_group_name}}
AZURE_DEFAULT_GROUP_NAME_MANAGED_DISKS: {{azure_default_group_name_managed_disks}}
AZURE_ADDITIONAL_GROUP_NAME_MANAGED_DISKS: {{azure_additional_group_name_managed_disks}}
AZURE_DEFAULT_GROUP_NAME_CENTOS: {{azure_default_group_name_centos}}
AZURE_ADDITIONAL_GROUP_NAME_CENTOS: {{azure_additional_group_name_centos}}
AZURE_STORAGE_ACCOUNT_NAME: {{azure_storage_account_name}}
AZURE_VNET_NAME_FOR_BATS: {{azure_vnet_name_for_bats}}
AZURE_VNET_NAME_FOR_LIFECYCLE: {{azure_vnet_name_for_lifecycle}}
Expand Down Expand Up @@ -97,8 +97,8 @@ jobs:
AZURE_CLIENT_ID: {{azure_client_id}}
AZURE_CLIENT_SECRET: {{azure_client_secret}}
AZURE_TENANT_ID: {{azure_tenant_id}}
AZURE_GROUP_NAME_FOR_VMS: {{azure_group_name_for_vms}}
AZURE_GROUP_NAME_FOR_NETWORK: {{azure_group_name_for_network}}
AZURE_DEFAULT_GROUP_NAME: {{azure_default_group_name}}
AZURE_ADDITIONAL_GROUP_NAME: {{azure_additional_group_name}}
AZURE_STORAGE_ACCOUNT_NAME: {{azure_storage_account_name}}
AZURE_VNET_NAME_FOR_LIFECYCLE: {{azure_vnet_name_for_lifecycle}}
AZURE_BOSH_SUBNET_NAME: {{azure_bosh_subnet_name}}
Expand Down Expand Up @@ -127,8 +127,8 @@ jobs:
AZURE_CLIENT_ID: {{azure_client_id}}
AZURE_CLIENT_SECRET: {{azure_client_secret}}
AZURE_TENANT_ID: {{azure_tenant_id}}
AZURE_GROUP_NAME_FOR_VMS: {{azure_group_name_for_vms}}
AZURE_GROUP_NAME_FOR_NETWORK: {{azure_group_name_for_network}}
AZURE_DEFAULT_GROUP_NAME: {{azure_default_group_name}}
AZURE_ADDITIONAL_GROUP_NAME: {{azure_additional_group_name}}
AZURE_VNET_NAME_FOR_BATS: {{azure_vnet_name_for_bats}}
AZURE_STORAGE_ACCOUNT_NAME: {{azure_storage_account_name}}
AZURE_BOSH_SUBNET_NAME: {{azure_bosh_subnet_name}}
Expand All @@ -149,7 +149,7 @@ jobs:
AZURE_CLIENT_ID: {{azure_client_id}}
AZURE_CLIENT_SECRET: {{azure_client_secret}}
AZURE_TENANT_ID: {{azure_tenant_id}}
AZURE_GROUP_NAME: {{azure_group_name_for_network}}
AZURE_GROUP_NAME: {{azure_additional_group_name}}
AZURE_VNET_NAME_FOR_BATS: {{azure_vnet_name_for_bats}}
AZURE_CF_SUBNET_NAME: {{azure_cf_subnet_name}}
AZURE_CF_SECOND_SUBNET_NAME: {{azure_cf_second_subnet_name}}
Expand Down Expand Up @@ -192,10 +192,10 @@ jobs:
AZURE_CLIENT_ID: {{azure_client_id}}
AZURE_CLIENT_SECRET: {{azure_client_secret}}
AZURE_TENANT_ID: {{azure_tenant_id}}
AZURE_GROUP_NAME_FOR_VMS: {{azure_group_name_for_vms}}
AZURE_GROUP_NAME_FOR_NETWORK: {{azure_group_name_for_network}}
AZURE_GROUP_NAME_FOR_VMS: {{azure_group_name_for_vms_managed_disks}}
AZURE_GROUP_NAME_FOR_NETWORK: {{azure_group_name_for_network_managed_disks}}
AZURE_DEFAULT_GROUP_NAME: {{azure_default_group_name}}
AZURE_ADDITIONAL_GROUP_NAME: {{azure_additional_group_name}}
AZURE_DEFAULT_GROUP_NAME: {{azure_default_group_name_managed_disks}}
AZURE_ADDITIONAL_GROUP_NAME: {{azure_additional_group_name_managed_disks}}
AZURE_STORAGE_ACCOUNT_NAME: {{azure_storage_account_name_managed_disks}}
AZURE_VNET_NAME_FOR_LIFECYCLE: {{azure_vnet_name_for_lifecycle}}
AZURE_BOSH_SUBNET_NAME: {{azure_bosh_subnet_name}}
Expand Down Expand Up @@ -224,8 +224,8 @@ jobs:
AZURE_CLIENT_ID: {{azure_client_id}}
AZURE_CLIENT_SECRET: {{azure_client_secret}}
AZURE_TENANT_ID: {{azure_tenant_id}}
AZURE_GROUP_NAME_FOR_VMS: {{azure_group_name_for_vms_managed_disks}}
AZURE_GROUP_NAME_FOR_NETWORK: {{azure_group_name_for_network_managed_disks}}
AZURE_DEFAULT_GROUP_NAME: {{azure_default_group_name_managed_disks}}
AZURE_ADDITIONAL_GROUP_NAME: {{azure_additional_group_name_managed_disks}}
AZURE_VNET_NAME_FOR_BATS: {{azure_vnet_name_for_bats}}
AZURE_BOSH_SUBNET_NAME: {{azure_bosh_subnet_name}}
AZURE_DEFAULT_SECURITY_GROUP: {{azure_default_security_group}}
Expand All @@ -245,7 +245,7 @@ jobs:
AZURE_CLIENT_ID: {{azure_client_id}}
AZURE_CLIENT_SECRET: {{azure_client_secret}}
AZURE_TENANT_ID: {{azure_tenant_id}}
AZURE_GROUP_NAME: {{azure_group_name_for_network_managed_disks}}
AZURE_GROUP_NAME: {{azure_additional_group_name_managed_disks}}
AZURE_VNET_NAME_FOR_BATS: {{azure_vnet_name_for_bats}}
AZURE_CF_SUBNET_NAME: {{azure_cf_subnet_name}}
AZURE_CF_SECOND_SUBNET_NAME: {{azure_cf_second_subnet_name}}
Expand Down Expand Up @@ -293,8 +293,8 @@ jobs:
AZURE_CLIENT_ID: {{azure_client_id}}
AZURE_CLIENT_SECRET: {{azure_client_secret}}
AZURE_TENANT_ID: {{azure_tenant_id}}
AZURE_GROUP_NAME_FOR_VMS: {{azure_group_name_for_vms_centos}}
AZURE_GROUP_NAME_FOR_NETWORK: {{azure_group_name_for_network_centos}}
AZURE_DEFAULT_GROUP_NAME: {{azure_default_group_name_centos}}
AZURE_ADDITIONAL_GROUP_NAME: {{azure_additional_group_name_centos}}
AZURE_VNET_NAME_FOR_BATS: {{azure_vnet_name_for_bats}}
AZURE_BOSH_SUBNET_NAME: {{azure_bosh_subnet_name}}
AZURE_DEFAULT_SECURITY_GROUP: {{azure_default_security_group}}
Expand All @@ -312,7 +312,7 @@ jobs:
AZURE_CLIENT_ID: {{azure_client_id}}
AZURE_CLIENT_SECRET: {{azure_client_secret}}
AZURE_TENANT_ID: {{azure_tenant_id}}
AZURE_GROUP_NAME: {{azure_group_name_for_network_centos}}
AZURE_GROUP_NAME: {{azure_additional_group_name_centos}}
AZURE_VNET_NAME_FOR_BATS: {{azure_vnet_name_for_bats}}
AZURE_CF_SUBNET_NAME: {{azure_cf_subnet_name}}
AZURE_CF_SECOND_SUBNET_NAME: {{azure_cf_second_subnet_name}}
Expand Down
24 changes: 12 additions & 12 deletions ci/tasks/azure-provision.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ set -e
: ${AZURE_CLIENT_ID:?}
: ${AZURE_CLIENT_SECRET:?}
: ${AZURE_TENANT_ID:?}
: ${AZURE_GROUP_NAME_FOR_VMS:?}
: ${AZURE_GROUP_NAME_FOR_NETWORK:?}
: ${AZURE_GROUP_NAME_FOR_VMS_MANAGED_DISKS:?}
: ${AZURE_GROUP_NAME_FOR_NETWORK_MANAGED_DISKS:?}
: ${AZURE_GROUP_NAME_FOR_VMS_CENTOS:?}
: ${AZURE_GROUP_NAME_FOR_NETWORK_CENTOS:?}
: ${AZURE_DEFAULT_GROUP_NAME:?}
: ${AZURE_ADDITIONAL_GROUP_NAME:?}
: ${AZURE_DEFAULT_GROUP_NAME_MANAGED_DISKS:?}
: ${AZURE_ADDITIONAL_GROUP_NAME_MANAGED_DISKS:?}
: ${AZURE_DEFAULT_GROUP_NAME_CENTOS:?}
: ${AZURE_ADDITIONAL_GROUP_NAME_CENTOS:?}
: ${AZURE_REGION_NAME:?}
: ${AZURE_REGION_SHORT_NAME:?}
: ${AZURE_STORAGE_ACCOUNT_NAME:?}
Expand All @@ -27,7 +27,7 @@ azure config mode arm

set +e

resource_group_names="${AZURE_GROUP_NAME_FOR_VMS} ${AZURE_GROUP_NAME_FOR_NETWORK} ${AZURE_GROUP_NAME_FOR_VMS_MANAGED_DISKS} ${AZURE_GROUP_NAME_FOR_NETWORK_MANAGED_DISKS} ${AZURE_GROUP_NAME_FOR_VMS_CENTOS} ${AZURE_GROUP_NAME_FOR_NETWORK_CENTOS}"
resource_group_names="${AZURE_DEFAULT_GROUP_NAME} ${AZURE_ADDITIONAL_GROUP_NAME} ${AZURE_DEFAULT_GROUP_NAME_MANAGED_DISKS} ${AZURE_ADDITIONAL_GROUP_NAME_MANAGED_DISKS} ${AZURE_DEFAULT_GROUP_NAME_CENTOS} ${AZURE_ADDITIONAL_GROUP_NAME_CENTOS}"
for resource_group_name in ${resource_group_names}
do
# Check if the resource group already exists
Expand All @@ -52,7 +52,7 @@ done
set -e

# Create the virtual networks, subnets, and the security groups
resource_group_names="${AZURE_GROUP_NAME_FOR_VMS} ${AZURE_GROUP_NAME_FOR_NETWORK} ${AZURE_GROUP_NAME_FOR_VMS_MANAGED_DISKS} ${AZURE_GROUP_NAME_FOR_NETWORK_MANAGED_DISKS} ${AZURE_GROUP_NAME_FOR_VMS_CENTOS} ${AZURE_GROUP_NAME_FOR_NETWORK_CENTOS}"
resource_group_names="${AZURE_DEFAULT_GROUP_NAME} ${AZURE_ADDITIONAL_GROUP_NAME} ${AZURE_DEFAULT_GROUP_NAME_MANAGED_DISKS} ${AZURE_ADDITIONAL_GROUP_NAME_MANAGED_DISKS} ${AZURE_DEFAULT_GROUP_NAME_CENTOS} ${AZURE_ADDITIONAL_GROUP_NAME_CENTOS}"
for resource_group_name in ${resource_group_names}
do
echo azure group create ${resource_group_name} ${AZURE_REGION_SHORT_NAME}
Expand Down Expand Up @@ -83,14 +83,14 @@ EOF
done

# Create the Public IPs
resource_group_names="${AZURE_GROUP_NAME_FOR_VMS} ${AZURE_GROUP_NAME_FOR_NETWORK} ${AZURE_GROUP_NAME_FOR_VMS_MANAGED_DISKS} ${AZURE_GROUP_NAME_FOR_NETWORK_MANAGED_DISKS} ${AZURE_GROUP_NAME_FOR_VMS_CENTOS} ${AZURE_GROUP_NAME_FOR_NETWORK_CENTOS}"
resource_group_names="${AZURE_DEFAULT_GROUP_NAME} ${AZURE_ADDITIONAL_GROUP_NAME} ${AZURE_DEFAULT_GROUP_NAME_MANAGED_DISKS} ${AZURE_ADDITIONAL_GROUP_NAME_MANAGED_DISKS} ${AZURE_DEFAULT_GROUP_NAME_CENTOS} ${AZURE_ADDITIONAL_GROUP_NAME_CENTOS}"
for resource_group_name in ${resource_group_names}
do
echo azure network public-ip create --resource-group ${resource_group_name} --name AzureCPICI-cf-lifecycle --location ${AZURE_REGION_SHORT_NAME} --allocation-method Static
azure network public-ip create --resource-group ${resource_group_name} --name AzureCPICI-cf-lifecycle --location ${AZURE_REGION_SHORT_NAME} --allocation-method Static
done

resource_group_names="${AZURE_GROUP_NAME_FOR_NETWORK} ${AZURE_GROUP_NAME_FOR_NETWORK_MANAGED_DISKS} ${AZURE_GROUP_NAME_FOR_NETWORK_CENTOS}"
resource_group_names="${AZURE_ADDITIONAL_GROUP_NAME} ${AZURE_ADDITIONAL_GROUP_NAME_MANAGED_DISKS} ${AZURE_ADDITIONAL_GROUP_NAME_CENTOS}"
for resource_group_name in ${resource_group_names}
do
echo azure network public-ip create --resource-group ${resource_group_name} --name AzureCPICI-bosh --location ${AZURE_REGION_SHORT_NAME} --allocation-method Static
Expand All @@ -100,14 +100,14 @@ do
done

# Setup the storage account
resource_group_name="${AZURE_GROUP_NAME_FOR_VMS}"
resource_group_name="${AZURE_DEFAULT_GROUP_NAME}"
storage_account_name="${AZURE_STORAGE_ACCOUNT_NAME}"
azure storage account create --location ${AZURE_REGION_SHORT_NAME} --sku-name LRS --kind Storage --resource-group ${resource_group_name} ${storage_account_name}
storage_account_key=$(azure storage account keys list ${storage_account_name} --resource-group ${resource_group_name} --json | jq '.[0].value' -r)
azure storage container create --account-name ${storage_account_name} --account-key ${storage_account_key} --container bosh
azure storage container create --account-name ${storage_account_name} --account-key ${storage_account_key} --permission blob --container stemcell

resource_group_name="${AZURE_GROUP_NAME_FOR_VMS_MANAGED_DISKS}"
resource_group_name="${AZURE_DEFAULT_GROUP_NAME_MANAGED_DISKS}"
storage_account_name="${AZURE_STORAGE_ACCOUNT_NAME_MANAGED_DISKS}"
azure storage account create --location ${AZURE_REGION_SHORT_NAME} --sku-name LRS --kind Storage --resource-group ${resource_group_name} ${storage_account_name}
storage_account_key=$(azure storage account keys list ${storage_account_name} --resource-group ${resource_group_name} --json | jq '.[0].value' -r)
Expand Down
12 changes: 6 additions & 6 deletions ci/tasks/azure-provision.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ params:
AZURE_CLIENT_ID: ""
AZURE_CLIENT_SECRET: ""
AZURE_TENANT_ID: ""
AZURE_GROUP_NAME_FOR_VMS: ""
AZURE_GROUP_NAME_FOR_NETWORK: ""
AZURE_GROUP_NAME_FOR_VMS_MANAGED_DISKS: ""
AZURE_GROUP_NAME_FOR_NETWORK_MANAGED_DISKS: ""
AZURE_GROUP_NAME_FOR_VMS_CENTOS: ""
AZURE_GROUP_NAME_FOR_NETWORK_CENTOS: ""
AZURE_DEFAULT_GROUP_NAME: ""
AZURE_ADDITIONAL_GROUP_NAME: ""
AZURE_DEFAULT_GROUP_NAME_MANAGED_DISKS: ""
AZURE_ADDITIONAL_GROUP_NAME_MANAGED_DISKS: ""
AZURE_DEFAULT_GROUP_NAME_CENTOS: ""
AZURE_ADDITIONAL_GROUP_NAME_CENTOS: ""
AZURE_REGION_NAME: ""
AZURE_REGION_SHORT_NAME: ""
AZURE_STORAGE_ACCOUNT_NAME: ""
Expand Down
30 changes: 15 additions & 15 deletions ci/tasks/reset-resources.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ function exit_if_error {
: ${AZURE_TENANT_ID:?}
: ${AZURE_CLIENT_ID:?}
: ${AZURE_CLIENT_SECRET:?}
: ${AZURE_GROUP_NAME_FOR_VMS:?}
: ${AZURE_GROUP_NAME_FOR_NETWORK:?}
: ${AZURE_GROUP_NAME_FOR_VMS_MANAGED_DISKS:?}
: ${AZURE_GROUP_NAME_FOR_NETWORK_MANAGED_DISKS:?}
: ${AZURE_GROUP_NAME_FOR_VMS_CENTOS:?}
: ${AZURE_GROUP_NAME_FOR_NETWORK_CENTOS:?}
: ${AZURE_DEFAULT_GROUP_NAME:?}
: ${AZURE_ADDITIONAL_GROUP_NAME:?}
: ${AZURE_DEFAULT_GROUP_NAME_MANAGED_DISKS:?}
: ${AZURE_ADDITIONAL_GROUP_NAME_MANAGED_DISKS:?}
: ${AZURE_DEFAULT_GROUP_NAME_CENTOS:?}
: ${AZURE_ADDITIONAL_GROUP_NAME_CENTOS:?}
: ${AZURE_STORAGE_ACCOUNT_NAME:?}
: ${AZURE_VNET_NAME_FOR_BATS:?}
: ${AZURE_VNET_NAME_FOR_LIFECYCLE:?}
Expand All @@ -29,7 +29,7 @@ azure config mode arm

set +e

resource_group_names="${AZURE_GROUP_NAME_FOR_VMS} ${AZURE_GROUP_NAME_FOR_NETWORK} ${AZURE_GROUP_NAME_FOR_VMS_MANAGED_DISKS} ${AZURE_GROUP_NAME_FOR_NETWORK_MANAGED_DISKS} ${AZURE_GROUP_NAME_FOR_VMS_CENTOS} ${AZURE_GROUP_NAME_FOR_NETWORK_CENTOS}"
resource_group_names="${AZURE_DEFAULT_GROUP_NAME} ${AZURE_ADDITIONAL_GROUP_NAME} ${AZURE_DEFAULT_GROUP_NAME_MANAGED_DISKS} ${AZURE_ADDITIONAL_GROUP_NAME_MANAGED_DISKS} ${AZURE_DEFAULT_GROUP_NAME_CENTOS} ${AZURE_ADDITIONAL_GROUP_NAME_CENTOS}"
for resource_group_name in ${resource_group_names}
do
echo "Check if the resource group exists"
Expand All @@ -46,7 +46,7 @@ set -e

echo "Check if the needed resources exist"

resource_group_names="${AZURE_GROUP_NAME_FOR_VMS} ${AZURE_GROUP_NAME_FOR_NETWORK} ${AZURE_GROUP_NAME_FOR_VMS_MANAGED_DISKS} ${AZURE_GROUP_NAME_FOR_NETWORK_MANAGED_DISKS} ${AZURE_GROUP_NAME_FOR_VMS_CENTOS} ${AZURE_GROUP_NAME_FOR_NETWORK_CENTOS}"
resource_group_names="${AZURE_DEFAULT_GROUP_NAME} ${AZURE_ADDITIONAL_GROUP_NAME} ${AZURE_DEFAULT_GROUP_NAME_MANAGED_DISKS} ${AZURE_ADDITIONAL_GROUP_NAME_MANAGED_DISKS} ${AZURE_DEFAULT_GROUP_NAME_CENTOS} ${AZURE_ADDITIONAL_GROUP_NAME_CENTOS}"
for resource_group_name in ${resource_group_names}
do
vnets="${AZURE_VNET_NAME_FOR_BATS} ${AZURE_VNET_NAME_FOR_LIFECYCLE}"
Expand Down Expand Up @@ -80,7 +80,7 @@ do
fi
done

resource_group_names="${AZURE_GROUP_NAME_FOR_NETWORK} ${AZURE_GROUP_NAME_FOR_NETWORK_MANAGED_DISKS} ${AZURE_GROUP_NAME_FOR_NETWORK_CENTOS}"
resource_group_names="${AZURE_ADDITIONAL_GROUP_NAME} ${AZURE_ADDITIONAL_GROUP_NAME_MANAGED_DISKS} ${AZURE_ADDITIONAL_GROUP_NAME_CENTOS}"
for resource_group_name in ${resource_group_names}
do
public_ips="AzureCPICI-bosh AzureCPICI-cf-bats"
Expand All @@ -97,30 +97,30 @@ done

set +e

echo "azure storage account show --resource-group ${AZURE_GROUP_NAME_FOR_VMS} ${AZURE_STORAGE_ACCOUNT_NAME}"
azure storage account show --resource-group ${AZURE_GROUP_NAME_FOR_VMS} ${AZURE_STORAGE_ACCOUNT_NAME}
echo "azure storage account show --resource-group ${AZURE_DEFAULT_GROUP_NAME} ${AZURE_STORAGE_ACCOUNT_NAME}"
azure storage account show --resource-group ${AZURE_DEFAULT_GROUP_NAME} ${AZURE_STORAGE_ACCOUNT_NAME}

if [ $? -eq 1 ]; then
echo "The task failed because the storage account ${AZURE_STORAGE_ACCOUNT_NAME} does not exist in resource group ${AZURE_GROUP_NAME_FOR_VMS}"
echo "The task failed because the storage account ${AZURE_STORAGE_ACCOUNT_NAME} does not exist in resource group ${AZURE_DEFAULT_GROUP_NAME}"
exit_if_error
fi

set -e

AZURE_ACCOUNT_KEY=$(azure storage account keys list ${AZURE_STORAGE_ACCOUNT_NAME} --resource-group ${AZURE_GROUP_NAME_FOR_VMS} --json | jq '.[0].value' -r)
AZURE_ACCOUNT_KEY=$(azure storage account keys list ${AZURE_STORAGE_ACCOUNT_NAME} --resource-group ${AZURE_DEFAULT_GROUP_NAME} --json | jq '.[0].value' -r)
containers="bosh stemcell"
for container in ${containers}
do
container_actual=$(azure storage container show --account-name ${AZURE_STORAGE_ACCOUNT_NAME} --account-key ${AZURE_ACCOUNT_KEY} --container ${container} --json | jq '.name' -r)
if [ "${container_actual}" != "${container}" ]; then
echo "The task failed because the container ${container} does not exist in resource group ${AZURE_GROUP_NAME_FOR_VMS}"
echo "The task failed because the container ${container} does not exist in resource group ${AZURE_DEFAULT_GROUP_NAME}"
exit_if_error
fi
done

echo "Deleting the unneeded resources"

resource_group_names="${AZURE_GROUP_NAME_FOR_VMS} ${AZURE_GROUP_NAME_FOR_NETWORK} ${AZURE_GROUP_NAME_FOR_VMS_MANAGED_DISKS} ${AZURE_GROUP_NAME_FOR_NETWORK_MANAGED_DISKS} ${AZURE_GROUP_NAME_FOR_VMS_CENTOS} ${AZURE_GROUP_NAME_FOR_NETWORK_CENTOS}"
resource_group_names="${AZURE_DEFAULT_GROUP_NAME} ${AZURE_ADDITIONAL_GROUP_NAME} ${AZURE_DEFAULT_GROUP_NAME_MANAGED_DISKS} ${AZURE_ADDITIONAL_GROUP_NAME_MANAGED_DISKS} ${AZURE_DEFAULT_GROUP_NAME_CENTOS} ${AZURE_ADDITIONAL_GROUP_NAME_CENTOS}"
for resource_group_name in ${resource_group_names}
do
vms=$(azure vm list --resource-group ${resource_group_name} --json | jq '.[].name' -r)
Expand Down
12 changes: 6 additions & 6 deletions ci/tasks/reset-resources.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ params:
AZURE_TENANT_ID: ""
AZURE_CLIENT_ID: ""
AZURE_CLIENT_SECRET: ""
AZURE_GROUP_NAME_FOR_VMS: ""
AZURE_GROUP_NAME_FOR_NETWORK: ""
AZURE_GROUP_NAME_FOR_VMS_MANAGED_DISKS: ""
AZURE_GROUP_NAME_FOR_NETWORK_MANAGED_DISKS: ""
AZURE_GROUP_NAME_FOR_VMS_CENTOS: ""
AZURE_GROUP_NAME_FOR_NETWORK_CENTOS: ""
AZURE_DEFAULT_GROUP_NAME: ""
AZURE_ADDITIONAL_GROUP_NAME: ""
AZURE_DEFAULT_GROUP_NAME_MANAGED_DISKS: ""
AZURE_ADDITIONAL_GROUP_NAME_MANAGED_DISKS: ""
AZURE_DEFAULT_GROUP_NAME_CENTOS: ""
AZURE_ADDITIONAL_GROUP_NAME_CENTOS: ""
AZURE_STORAGE_ACCOUNT_NAME: ""
AZURE_VNET_NAME_FOR_BATS: ""
AZURE_VNET_NAME_FOR_LIFECYCLE: ""
Expand Down
Loading