Merge remote-tracking branch 'origin/azure-dev' into tm-azure-merge-a…

…nd-update
tmiddelkoop · Dec 2, 2021 · f213ebf · f213ebf
2 parents 40c7280 + 5eb1830
commit f213ebf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/scripts/azure-create.sh b/scripts/azure-create.sh
@@ -51,7 +51,7 @@ echo '--- connected to $NAME@IP'
 sudo apt-get update
 sudo apt-get install --yes azure-cli
 az login --identity
-sudo apt-get install --yes git python3-pip python3-venv bash-completion
+sudo apt-get install --yes git python3-pip python3-venv bash-completion jq
 ssh-keyscan ${GITHUB} > .ssh/known_hosts
 git config --global color.ui auto
 git config --global push.default simple

diff --git a/scripts/azure-delete.sh b/scripts/azure-delete.sh
@@ -7,7 +7,9 @@ VM=essentials
 
 echo "=== azure-delete.sh $PROJECT $BRANCH"
 SUBSCRIPTION=$(az account show --query id -otsv)
-RESOURCE_GROUP="rg-${VM}-dev"
+RESOURCE_GROUP_DEV="rg-${VM}-dev"
+RESOURCE_GROUP="rg-${VM}"
 
 az vm delete --resource-group $RESOURCE_GROUP --name $VM --yes
 az group delete --resource-group $RESOURCE_GROUP --yes
+az group delete --resource-group $RESOURCE_GROUP_DEV --yes