updated arm templates (microsoft#94)

nikonorov-d · May 16, 2018 · 608aac4 · 608aac4
1 parent 6538d98
commit 608aac4
Show file tree

Hide file tree

Showing 28 changed files with 10 additions and 10 deletions.
diff --git a/...refunctions/arm template/azuredeploy.json → ...urefunctions/armtemplate/azuredeploy.json b/...refunctions/arm template/azuredeploy.json → ...urefunctions/armtemplate/azuredeploy.json
diff --git a/labs/vstsextend/azurefunctions/readme.md b/labs/vstsextend/azurefunctions/readme.md
@@ -43,7 +43,7 @@ Azure Functions is an event driven, compute-on-demand experience that extends th
 
 1. Click **Deploy To Azure** to provision an Azure App service plan with two web apps.
 
-   [![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FMicrosoft%2Falmvm%2Farmtemplates%2Flabs%2Fvstsextend%2Farmtemplates%2Fazurefunctions%2Fazuredeploy.json)
+   [![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FMicrosoft%2Falmvm%2Fmaster%2Flabs%2Fvstsextend%2Fazurefunctions%2Farmtemplate%2Fazuredeploy.json)
 
 1. It should take approximately 5-10 minutes to provision the resources. Once the deployment is successful, you will see the resources as shown.
 

diff --git a/...d/deploymentgroups/azurewebsqldeploy.json → ...groups/armtemplate/azurewebsqldeploy.json b/...d/deploymentgroups/azurewebsqldeploy.json → ...groups/armtemplate/azurewebsqldeploy.json
@@ -136,7 +136,7 @@
         "vmExtensionName": "dscExtension",
         "vmCSExtensionName": "CustomScriptExtension",
         "modulesUrl": "https://github.com/bayernmunich/AspNetWebApp/blob/master/WebServerConfig5.0.ps1.zip?raw=true",
-        "modulesDBUrl": "https://raw.githubusercontent.com/Microsoft/VSTS-DevOps-Labs/deploymentgroups/deploymentgroups/configureDBfirewallUsers.ps1",
+        "modulesDBUrl": "https://raw.githubusercontent.com/Microsoft/almvm/master/labs/vstsextend/deploymentgroups/armtemplate/configureDBfirewallUsers.ps1",
         "configurationFunction": "WebServerConfig.ps1\\WebServerConfig",
         "sqlDns":"[concat(parameters('envPrefixName'), 'sql', uniqueString(resourceGroup().id))]"
     },

diff --git a/...ploymentgroups/azurewebsqlparameters.json → ...ps/armtemplate/azurewebsqlparameters.json b/...ploymentgroups/azurewebsqlparameters.json → ...ps/armtemplate/azurewebsqlparameters.json
diff --git a/...oymentgroups/configureDBfirewallUsers.ps1 → .../armtemplate/configureDBfirewallUsers.ps1 b/...oymentgroups/configureDBfirewallUsers.ps1 → .../armtemplate/configureDBfirewallUsers.ps1
diff --git a/labs/vstsextend/deploymentgroups/readme.md b/labs/vstsextend/deploymentgroups/readme.md
@@ -46,7 +46,7 @@ The following resources will be provisioned on the Azure using an ARM template:
 
 1. Click on the **Deploy to Azure** button to initiate the resource provisioning. It takes approximately 10-15 minutes to complete the deployment. Provide all the necessary information as shown.
 
-   [![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FMicrosoft%2FVSTS-DevOps-Labs%2Fmaster%2Farmtemplates%2Fdeploymentgroups%2Fazurewebsqldeploy.json){:target="_blank"}
+   [![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FMicrosoft%2Falmvm%2Fmaster%2Flabs%2Fvstsextend%2Fdeploymentgroups%2Farmtemplate%2Fazurewebsqldeploy.json){:target="_blank"}
 
    ![Azure](images/azure.png)
 

diff --git a/...sextend/docker/templates/azuredeploy.json → ...xtend/docker/armtemplate/azuredeploy.json b/...sextend/docker/templates/azuredeploy.json → ...xtend/docker/armtemplate/azuredeploy.json
diff --git a/...ker/templates/azuredeploy.parameters.json → ...r/armtemplate/azuredeploy.parameters.json b/...ker/templates/azuredeploy.parameters.json → ...r/armtemplate/azuredeploy.parameters.json
diff --git a/labs/vstsextend/docker/readme.md b/labs/vstsextend/docker/readme.md
@@ -44,7 +44,7 @@ The below diagram details the VSTS DevOps workflow with Docker:
 
 1. Click on the **Deploy to Azure** button to initiate the configuration.
 
-   [![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FMicrosoft%2FVSTS-DevOps-Labs%2Fmaster%2Farmtemplates%2Fdocker%2Fazuredeploy.json){:target="_blank"}
+   [![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FMicrosoft%2Falmvm%2Fmaster%2Flabs%2Fvstsextend%2Fdocker%2Farmtemplate%2Fazuredeploy.json){:target="_blank"}
 
 1. In the Custom deployment window, select the **Subscription** type, leave the default selection for the resource group and select the **Location**. Provide the **ACR Name, Site Name**, **DB Server Name**, accept the **Terms and Conditions** and click on the **Purchase** button to provision the following resources:
 

diff --git a/...end/kubernetes/templates/azuredeploy.json → ...d/kubernetes/armtemplate/azuredeploy.json b/...end/kubernetes/templates/azuredeploy.json → ...d/kubernetes/armtemplate/azuredeploy.json
diff --git a/...tes/templates/azuredeploy.parameters.json → ...s/armtemplate/azuredeploy.parameters.json b/...tes/templates/azuredeploy.parameters.json → ...s/armtemplate/azuredeploy.parameters.json
diff --git a/labs/vstsextend/kubernetes/readme.md b/labs/vstsextend/kubernetes/readme.md
@@ -137,7 +137,7 @@ The following azure resources need to be configured for this lab:
     * Service Principal Client
     * Service Principal Client Secret
 
-   [![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FMicrosoft%2FVSTS-DevOps-Labs%2Fmaster%2Farmtemplates%2Fkubernetes%2Fazuredeploy.json){:target="_blank"}
+   [![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FMicrosoft%2Falmvm%2Fmaster%2Flabs%2Fvstsextend%2Fkubernetes%2Farmtemplate%2Fazuredeploy.json){:target="_blank"}
 
    {% include important.html content= "At the time of writing this lab, only the **East US**, **Central US**, **West Europe**, **Canada Central** and **Canada East** are the supported locations. For updates, refer to the [AKS Azure Regions](https://docs.microsoft.com/en-in/azure/aks/container-service-quotas){:target=\"_blank\"}" %}
 

diff --git a/...nd/selenium/arm template/azuredeploy.json → ...end/selenium/armtemplate/azuredeploy.json b/...nd/selenium/arm template/azuredeploy.json → ...end/selenium/armtemplate/azuredeploy.json
@@ -88,7 +88,7 @@
                         "value": "[resourceGroup().location]"
                     },
                     "fileUris": {
-                        "value": "https://raw.githubusercontent.com/Microsoft/VSTS-DevOps-Labs/master/selenium/arm%20template/chrome_%20firefox_VSTSagent_IIS.ps1"
+                        "value": "https://raw.githubusercontent.com/Microsoft/almvm/master/labs/vstsextend/selenium/armtemplate/chrome_%20firefox_VSTSagent_IIS.ps1"
                     }
                 }
             },
@@ -257,4 +257,4 @@
             "value": "[reference(variables('publicIPAddressName')).dnsSettings.fqdn]"
         }
     }
-}
+}
diff --git a/.../arm template/azuredeploy.parameters.json → ...m/armtemplate/azuredeploy.parameters.json b/.../arm template/azuredeploy.parameters.json → ...m/armtemplate/azuredeploy.parameters.json
diff --git a/...emplate/chrome_ firefox_VSTSagent_IIS.ps1 → ...emplate/chrome_ firefox_VSTSagent_IIS.ps1 b/...emplate/chrome_ firefox_VSTSagent_IIS.ps1 → ...emplate/chrome_ firefox_VSTSagent_IIS.ps1
@@ -47,7 +47,7 @@ Start-Sleep -s 35
 rm -Force $workdir\firefox*
 
 #copy geckodriver
-Invoke-WebRequest https://github.com/Microsoft/VSTS-DevOps-Labs/blob/master/selenium/arm%20template/geckodriver.exe?raw=true -OutFile "C:\Program Files\Mozilla Firefox\geckodriver.exe"
+Invoke-WebRequest https://github.com/Microsoft/almvm/blob/master/labs/vstsextend/selenium/armtemplate/geckodriver.exe?raw=true -OutFile "C:\Program Files\Mozilla Firefox\geckodriver.exe"
 
 #Downlaod and extract VSTS windows agent
 mkdir C:\VSTSwinAgent ;

diff --git a/...end/selenium/arm template/geckodriver.exe → ...tend/selenium/armtemplate/geckodriver.exe b/...end/selenium/arm template/geckodriver.exe → ...tend/selenium/armtemplate/geckodriver.exe
diff --git a/labs/vstsextend/selenium/readme.md b/labs/vstsextend/selenium/readme.md
@@ -34,7 +34,7 @@ If you are not familiar with creating Selenium UI tests in Visual Studio, you ma
 
 1. Click **Deploy To Azure** to provision a Windows Server 2016 virtual machine along with SQL Express 2017 and browsers - Chrome and FireFox.
 
-   [![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FMicrosoft%2FVSTS-DevOps-Labs%2Fmaster%2Farmtemplates%2Fselenium%2Fazuredeploy.json){:target="_blank"}
+   [![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FMicrosoft%2Falmvm%2Fmaster%2Flabs%2Fvstsextend%2Fselenium%2Farmtemplate%2Fazuredeploy.json){:target="_blank"}
 
 1. It should take approximately 20-25 minutes to provision the resources. Once the deployment is successful, you will see the resources as shown.
 

diff --git a/...tend/sonarqube/templates/azuredeploy.json → ...nd/sonarqube/armtemplate/azuredeploy.json b/...tend/sonarqube/templates/azuredeploy.json → ...nd/sonarqube/armtemplate/azuredeploy.json
diff --git a/...ube/templates/azuredeploy.parameters.json → ...e/armtemplate/azuredeploy.parameters.json b/...ube/templates/azuredeploy.parameters.json → ...e/armtemplate/azuredeploy.parameters.json
diff --git a/.../sonarqube/templates/images/visualize.png → ...onarqube/armtemplate/images/visualize.png b/.../sonarqube/templates/images/visualize.png → ...onarqube/armtemplate/images/visualize.png
diff --git a/...sextend/sonarqube/templates/metadata.json → ...xtend/sonarqube/armtemplate/metadata.json b/...sextend/sonarqube/templates/metadata.json → ...xtend/sonarqube/armtemplate/metadata.json
diff --git a/...rqube/templates/nested/azureDBDeploy.json → ...ube/armtemplate/nested/azureDBDeploy.json b/...rqube/templates/nested/azureDBDeploy.json → ...ube/armtemplate/nested/azureDBDeploy.json
diff --git a/...xtend/sonarqube/templates/oss/License.txt → ...end/sonarqube/armtemplate/oss/License.txt b/...xtend/sonarqube/templates/oss/License.txt → ...end/sonarqube/armtemplate/oss/License.txt
diff --git a/...rqube/templates/oss/ThirdPartyNotices.txt → ...ube/armtemplate/oss/ThirdPartyNotices.txt b/...rqube/templates/oss/ThirdPartyNotices.txt → ...ube/armtemplate/oss/ThirdPartyNotices.txt
diff --git a/...tes/scripts/Deploy-AzureResourceGroup.ps1 → ...ate/scripts/Deploy-AzureResourceGroup.ps1 b/...tes/scripts/Deploy-AzureResourceGroup.ps1 → ...ate/scripts/Deploy-AzureResourceGroup.ps1
diff --git a/...tes/scripts/SQdscAppConfiguration.ps1.zip → ...ate/scripts/SQdscAppConfiguration.ps1.zip b/...tes/scripts/SQdscAppConfiguration.ps1.zip → ...ate/scripts/SQdscAppConfiguration.ps1.zip
diff --git a/...ube/templates/scripts/secureSonarQube.ps1 → ...e/armtemplate/scripts/secureSonarQube.ps1 b/...ube/templates/scripts/secureSonarQube.ps1 → ...e/armtemplate/scripts/secureSonarQube.ps1
diff --git a/labs/vstsextend/sonarqube/readme.md b/labs/vstsextend/sonarqube/readme.md
@@ -46,7 +46,7 @@ In this lab, you will learn how to setup SonarQube on Azure and to integrate Vis
 
 1. Click the **Deploy To Azure** button below to provision SonarQube Server on Azure VM.
 
-   [![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FMicrosoft%2FVSTS-DevOps-Labs%2Fmaster%2Farmtemplates%2Fsonarqube%2Ftemplates%2Fazuredeploy.json){:target="_blank"}
+   [![Deploy to Azure](http://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2FMicrosoft%2Falmvm%2Fmaster%2Flabs%2Fvstsextend%2Fsonarqube%2Farmtemplate%2Fazuredeploy.json){:target="_blank"}
 
    ![CustomDeployAzure1](images/CustomDeployAzure1.png)