Arm 7.19.4 (#126)

* Updated added -preview azuredeploy_xray_vmss.json & azuredeploy.json

* Update azuredeploy_xray.parameters.json

* updated all require changes done for Artifactory 7.19.4 & X-ray 3.25.1

* updated api version in mainTemplate.json & remove -preview from azuredeploy_xray_vmss.json
This commit is contained in:
Anup Singh
2021-06-08 23:40:13 +05:30
committed by GitHub
parent 5b9899995b
commit 0db9211fa0
7 changed files with 25 additions and 13 deletions

View File

@@ -132,7 +132,7 @@
"name": "artifactoryVersion", "name": "artifactoryVersion",
"type": "Microsoft.Common.DropDown", "type": "Microsoft.Common.DropDown",
"label": "Artifactory-vm image version to deploy.", "label": "Artifactory-vm image version to deploy.",
"defaultValue": "7.18.6", "defaultValue": "7.19.4",
"toolTip": "Version of Artifactory to deploy", "toolTip": "Version of Artifactory to deploy",
"constraints": { "constraints": {
"allowedValues": [ "allowedValues": [
@@ -167,6 +167,10 @@
{ {
"label": "7.18.6", "label": "7.18.6",
"value": "0.0.18" "value": "0.0.18"
},
{
"label": "7.19.4",
"value": "0.0.19"
} }
], ],
"required": true "required": true

View File

@@ -79,7 +79,7 @@
}, },
"artifactoryVersion": { "artifactoryVersion": {
"type": "string", "type": "string",
"defaultValue": "0.0.18", "defaultValue": "0.0.19",
"allowedValues": [ "allowedValues": [
"0.0.8", "0.0.8",
"0.0.9", "0.0.9",
@@ -88,7 +88,8 @@
"0.0.12", "0.0.12",
"0.0.14", "0.0.14",
"0.0.15", "0.0.15",
"0.0.18" "0.0.18",
"0.0.19"
], ],
"metadata": { "metadata": {
"description": "Artifactory-vm image version to deploy." "description": "Artifactory-vm image version to deploy."
@@ -702,7 +703,7 @@
} }
}, },
{ {
"apiVersion": "2019-06-01", "apiVersion": "2021-02-01",
"type": "Microsoft.Storage/storageAccounts", "type": "Microsoft.Storage/storageAccounts",
"name": "[variables('storageAccountName')]", "name": "[variables('storageAccountName')]",
"location": "[parameters('location')]", "location": "[parameters('location')]",

View File

@@ -79,7 +79,7 @@
}, },
"artifactoryVersion": { "artifactoryVersion": {
"type": "string", "type": "string",
"defaultValue": "0.0.18", "defaultValue": "0.0.19",
"allowedValues": [ "allowedValues": [
"0.0.8", "0.0.8",
"0.0.9", "0.0.9",
@@ -88,7 +88,8 @@
"0.0.12", "0.0.12",
"0.0.14", "0.0.14",
"0.0.15", "0.0.15",
"0.0.18" "0.0.18",
"0.0.19"
], ],
"metadata": { "metadata": {
"description": "Artifactory-vm image version to deploy." "description": "Artifactory-vm image version to deploy."

View File

@@ -123,7 +123,7 @@
"name": "xrayVersion", "name": "xrayVersion",
"type": "Microsoft.Common.DropDown", "type": "Microsoft.Common.DropDown",
"label": "Xray-vm image version to deploy.", "label": "Xray-vm image version to deploy.",
"defaultValue": "3.24.2", "defaultValue": "3.25.1",
"toolTip": "Version of Xray to deploy", "toolTip": "Version of Xray to deploy",
"constraints": { "constraints": {
"allowedValues": [ "allowedValues": [
@@ -162,6 +162,10 @@
{ {
"label": "3.24.2", "label": "3.24.2",
"value": "0.0.21" "value": "0.0.21"
},
{
"label": "3.25.1",
"value": "0.0.22"
} }
], ],
"required": true "required": true

View File

@@ -19,7 +19,7 @@
}, },
"xrayVersion": { "xrayVersion": {
"type": "string", "type": "string",
"defaultValue": "0.0.21", "defaultValue": "0.0.22",
"allowedValues": [ "allowedValues": [
"0.0.10", "0.0.10",
"0.0.11", "0.0.11",
@@ -29,7 +29,8 @@
"0.0.17", "0.0.17",
"0.0.18", "0.0.18",
"0.0.20", "0.0.20",
"0.0.21" "0.0.21",
"0.0.22"
], ],
"metadata": { "metadata": {
"description": "Xray-vm image version to deploy." "description": "Xray-vm image version to deploy."
@@ -267,7 +268,7 @@
}, },
{ {
"type": "Microsoft.Storage/storageAccounts", "type": "Microsoft.Storage/storageAccounts",
"apiVersion": "2019-06-01", "apiVersion": "2021-02-01",
"name": "[variables('storageAccountName')]", "name": "[variables('storageAccountName')]",
"location": "[parameters('location')]", "location": "[parameters('location')]",
"sku": { "sku": {

View File

@@ -33,7 +33,7 @@
"value": "10.0.1.0/24" "value": "10.0.1.0/24"
}, },
"xrayVersion": { "xrayVersion": {
"value": "0.0.21" "value": "0.0.22"
}, },
"artifactoryURL": { "artifactoryURL": {
"value": "http://ARTIFACTORY-URL.cloudapp.azure.com" "value": "http://ARTIFACTORY-URL.cloudapp.azure.com"

View File

@@ -19,7 +19,7 @@
}, },
"xrayVersion": { "xrayVersion": {
"type": "string", "type": "string",
"defaultValue": "0.0.21", "defaultValue": "0.0.22",
"allowedValues": [ "allowedValues": [
"0.0.10", "0.0.10",
"0.0.11", "0.0.11",
@@ -29,7 +29,8 @@
"0.0.17", "0.0.17",
"0.0.18", "0.0.18",
"0.0.20", "0.0.20",
"0.0.21" "0.0.21",
"0.0.22"
], ],
"metadata": { "metadata": {
"description": "Xray-vm image version to deploy." "description": "Xray-vm image version to deploy."