Infra dev (#1)

* Update buildserver_jennelle.parameters.json

More unique

* updated configurations

* Deleted parameters file

* Edited starting instruction

* Updated Build Config

* corrected URLs

* Edits to deployment

BuildServerDSCconfig.ps1

@@ -18,14 +18,27 @@
          Name = "git"
          DependsOn = "[cChocoInstaller]installChoco"
       }
+
+     cChocoPackageInstaller installJenkins
+      {
+         Ensure = 'Present'
+         Name = "jenkins"
+         DependsOn = "[cChocoInstaller]installChoco"
+      }
+      cChocoPackageInstaller installUninty
+      {
+         Ensure = 'Present'
+         Name = "unity"
+         DependsOn = "[cChocoInstaller]installChoco"
+      }
       xIEEsc EnableIEEscAdmin
         {
-            IsEnabled = $True
+            IsEnabled = $False
             UserRole  = "Administrators"
         }
         xIEEsc EnableIEEscUser
         {
-            IsEnabled = $False
+            IsEnabled = $True
             UserRole  = "Users"
         }
 

StartHere.ps1

@@ -1,38 +1,33 @@
 ## Use this file to start the deployment of your Jenkins Pipeline Build Server ##
+## Without modification, this deployment will build:           ##
+##              Windows Server 2012 R2 with:                   ##
+##                   Visual Studio Community - 2015 Update 3   ##
+##                   Jenkins 2.19.4                            ##
+##                   Unity 5.4.1                               ##
+##                   Git 2.11.0                                ##
 
-# Step 1 #
-# Copy and edit the "buildserver.paramenters.json" file to have names globally unique names for your deployment
-# Save the file to a convienent location on your local machine
 
-# Step 2 #
+
+# Step 1 #
 # Connect to Your Azure Subscription and create required resources #
 
 Login-AzureRmAccount
 Get-AzureRmSubscription
-$VSSubID = "8bae2860-70c1-4614-xxxx-60e97f4248dc"
+$VSSubID = "8bae2860-xxxx-4614-xxxx-60e97f4248dc"  ## replace with your Sub ID ##
 Set-AzureRmContext -SubscriptionID $VSSubID
 
-$RGName = "BuildServer"   
+$RGName = "BuildServerXXX"   
 New-AzureRmResourceGroup -Name $RGName -Location "West US" 
 
-# Step 3 #
+# Step 2 #
 # Set the variable to deploy the server template #
-# You will be deploying directly from Github - https://github.com/TobiahZ/JenkinsUnityBuildPipeline/blob/master/buildserverdeploy.json""
+# You will be deploying directly from Github - https://github.com/TobiahZ/JenkinsUnityBuildPipeline/blob/master/buildserverdeploy.json"
 
-$assetLocation = "https://github.com/TobiahZ/JenkinsUnityBuildPipeline/blob/master/" 
-$templateFileURI  = $assetLocation + "buildserverdeploy.json" 
-$parameterFile = "C:\users\jcroth\Desktop\jennelle.parameters.json"
+$assetLocation = "https://raw.githubusercontent.com/TobiahZ/JenkinsUnityBuildPipeline/master/" 
+$templateFileLoc  = $assetLocation + "buildserverdeploy.json" 
 
-# Step 4 #
+# Step 3 #
 # Deploy the build server to your Azure Subscription #
 
-New-AzureRmResourceGroupDeployment -ResourceGroupName $RGName -TemplateParameterFile $parameterFile -TemplateUri $templateFileURI -verbose
-
-
-
-#Copy required DSC resources to local machine
-
-Save-Module -Name cChoco -Path 'C:\Program Files (x86)'
-Install-Module -Name cChoco
-
+New-AzureRmResourceGroupDeployment -ResourceGroupName $RGName -TemplateUri $templateFileLoc -verbose
 

buildserverdeploy.json

@@ -5,7 +5,6 @@
    "parameters": {
     "newStorageAccountName": {
       "type": "string",
-      "defaultValue": "buildserverstor",
       "metadata": {
         "description": "Unique DNS Name for the Storage Account where the Virtual Machine's disks will be placed."
       }
@@ -55,14 +54,12 @@
     },
     "windowsOSVersion": {
       "type": "string",
-      "defaultValue": "VS-2015-Comm-AzureSDK-2.9-WS2012R2",
+      "defaultValue": "VS-2015-Comm-VSU3-AzureSDK-291-WS2012R2",
       "allowedValues": [
-        "2012-Datacenter",
-        "2012-R2-Datacenter",
-        "Windows-Server-Technical-Preview",
         "2016-Datacenter",
         "2016-Nano-Server",
-        "VS-2015-Comm-AzureSDK-2.9-WS2012R2"
+        "VS-2015-Comm-AzureSDK-2.9-WS2012R2",
+        "VS-2015-Comm-VSU3-AzureSDK-291-WS2012R2"
       ]
     },
     "adminUsername": {
@@ -78,16 +75,17 @@
       }
     },
     "dnsNameForPublicIP": {
-      "type": "string",
-      "defaultValue": "buildvm"
+      "type": "string"
     },
+
     "nicName": {
       "type": "string",
       "defaultValue": "buildserver_nic1"
     },
     "publicIPAddressName": {
       "type": "string",
-      "defaultValue": "buildvmpubip"
+      "defaultValue": "buildsrv_pubip"
+
     },
     "vmName": {
       "type": "string",
@@ -305,7 +303,7 @@
       {
 
       "type": "Microsoft.Compute/virtualMachines/extensions",
-      "name": "Microsoft.Powershell.DSC",
+      "name": "[concat(parameters('vmName'),'/Microsoft.Powershell.DSC')]",
       "apiVersion": "2016-03-30",
       "location": "westus",
       "properties": {
@@ -314,8 +312,8 @@
            "typeHandlerVersion": "2.19",
            "autoUpgradeMinorVersion": false,
            "settings": {
-                 "ModulesUrl": "http://githuburl",
-                 "ConfigurationFunction": "BuildServer.ps1\\BuildServer",
+                 "ModulesUrl": "https://raw.githubusercontent.com/TobiahZ/JenkinsUnityBuildPipeline/master/BuildServerDSCconfig.ps1.zip",
+                 "ConfigurationFunction": "BuildServerDSCconfig.ps1\\BuildServer",
                  "Properties": [],
                  "Privacy": {
                      "DataCollection": null