Add the choice of the jenkins release type.

Azure · Jun 20, 2017 · cd8664d · cd8664d
1 parent e3cfc52
commit cd8664d
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/solution_template/jenkins/CreateUiDefinition.json b/solution_template/jenkins/CreateUiDefinition.json
@@ -74,6 +74,30 @@
         },
         "osPlatform": "Linux",
         "visible": true
+      },
+      {
+        "name": "jenkinsReleaseType",
+        "type": "Microsoft.Common.DropDown",
+        "label": "Jenkins release type",
+        "defaultValue": "Azure Verified (Recommended)",
+        "toolTip": "",
+        "constraints": {
+          "allowedValues": [
+            {
+              "label": "Azure Verified (Recommended)",
+              "value": "verified"
+            },
+            {
+              "label": "LTS",
+              "value": "LTS"
+            },
+            {
+              "label": "Weekly Build",
+              "value": "weekly"
+            }
+          ]
+        },
+        "visible": true
       }
     ],
     "steps": [
@@ -193,7 +217,8 @@
       "storageAccountResourceGroup": "[steps('firstStep').storageAccount.resourceGroup]",
       "vmName": "[basics('vmName')]",
       "vmSize": "[steps('firstStep').vmSize]",
-      "location": "[location()]"
+      "location": "[location()]",
+      "jenkinsReleaseType": "[basics('jenkinsReleaseType')]"
     }
   }
 }
diff --git a/solution_template/jenkins/MainTemplate.json b/solution_template/jenkins/MainTemplate.json
@@ -6,7 +6,7 @@
       "metadata": {
         "description": "Artifacts location"
       },
-      "defaultValue": "https://raw.githubusercontent.com/Azure/azure-devops-utils/v0.16.0/",
+      "defaultValue": "https://raw.githubusercontent.com/Azure/azure-devops-utils/master/",
       "type": "string"
     },
     "_artifactsLocationSasToken": {
@@ -112,7 +112,7 @@
     },
     "jenkinsReleaseType": {
       "metadata": {
-        "description": "Jenkins release type (LTS or weekly)"
+        "description": "Jenkins release type (LTS or weekly or verified)"
       },
       "type": "string",
       "defaultValue": "LTS"
@@ -131,7 +131,7 @@
     "templateUrlIP": "[concat(variables('nestedUrl'),'/publicIP-',parameters('publicIPNewOrExisting'),'.json',parameters('_artifactsLocationSasToken'))]",
     "templateUrlStorage": "[concat(variables('nestedUrl'),'/storageAccount-',parameters('storageAccountNewOrExisting'),'.json',parameters('_artifactsLocationSasToken'))]",
     "templateUrlVM": "[concat(variables('nestedUrl'),'/VM-',parameters('authenticationType'),'.json',parameters('_artifactsLocationSasToken'))]",
-    "ubuntuSku": "14.04.5-LTS",
+    "ubuntuSku": "16.04-LTS",
     "virtualNetworkName": "[concat(parameters('vmName'), 'VNET')]",
     "virtualNetworkPrefix": "10.0.0.0/16",
     "vmDeploymentName": "[concat(parameters('vmName'), '-VM-deploy')]",