Arm 7.25.6 (#158)

* updated changes for Artifactory 7.25.6 & xray 3.32.2 version in templates file

* updated all the changes for artifactory 7.25.6 & xray 3.32.2
This commit is contained in:
Anup Singh
2021-09-16 23:11:36 +05:30
committed by GitHub
parent b38d10db61
commit 6e9bd33a0f
7 changed files with 41 additions and 15 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.24.3", "defaultValue": "7.25.6",
"toolTip": "Version of Artifactory to deploy", "toolTip": "Version of Artifactory to deploy",
"constraints": { "constraints": {
"allowedValues": [ "allowedValues": [
@@ -187,6 +187,10 @@
{ {
"label": "7.24.3", "label": "7.24.3",
"value": "0.0.25" "value": "0.0.25"
},
{
"label": "7.25.6",
"value": "0.0.27"
} }
], ],
"required": true "required": true

View File

@@ -79,7 +79,7 @@
}, },
"artifactoryVersion": { "artifactoryVersion": {
"type": "string", "type": "string",
"defaultValue": "0.0.25", "defaultValue": "0.0.27",
"allowedValues": [ "allowedValues": [
"0.0.8", "0.0.8",
"0.0.9", "0.0.9",
@@ -93,7 +93,8 @@
"0.0.21", "0.0.21",
"0.0.22", "0.0.22",
"0.0.23", "0.0.23",
"0.0.25" "0.0.25",
"0.0.27"
], ],
"metadata": { "metadata": {
"description": "Artifactory-vm image version to deploy." "description": "Artifactory-vm image version to deploy."
@@ -314,6 +315,20 @@
"nsgName": "[concat(variables('namingInfix'), 'nsg')]" "nsgName": "[concat(variables('namingInfix'), 'nsg')]"
}, },
"resources": [ "resources": [
{
"apiVersion": "2020-06-01",
"name": "pid-9cc90849-b021-4272-a33f-1922bd5c0f99-partnercenter",
"type": "Microsoft.Resources/deployments",
"properties": {
"mode": "Incremental",
"template": {
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
"contentVersion": "1.0.0.0",
"resources": []
}
}
},
{ {
"type": "Microsoft.Network/networkSecurityGroups", "type": "Microsoft.Network/networkSecurityGroups",
"location": "[parameters('location')]", "location": "[parameters('location')]",
@@ -723,7 +738,7 @@
{ {
"type": "Microsoft.Resources/deployments", "type": "Microsoft.Resources/deployments",
"name": "deploySQLDB", "name": "deploySQLDB",
"apiVersion": "2019-09-01", "apiVersion": "2020-06-01",
"properties": { "properties": {
"mode": "Incremental", "mode": "Incremental",
"templateLink": { "templateLink": {

View File

@@ -79,7 +79,7 @@
}, },
"artifactoryVersion": { "artifactoryVersion": {
"type": "string", "type": "string",
"defaultValue": "0.0.25", "defaultValue": "0.0.27",
"allowedValues": [ "allowedValues": [
"0.0.8", "0.0.8",
"0.0.9", "0.0.9",
@@ -93,7 +93,8 @@
"0.0.21", "0.0.21",
"0.0.22", "0.0.22",
"0.0.23", "0.0.23",
"0.0.25" "0.0.25",
"0.0.27"
], ],
"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.29.2", "defaultValue": "3.32.2",
"toolTip": "Version of Xray to deploy", "toolTip": "Version of Xray to deploy",
"constraints": { "constraints": {
"allowedValues": [ "allowedValues": [
@@ -182,6 +182,10 @@
{ {
"label": "3.29.2", "label": "3.29.2",
"value": "0.0.26" "value": "0.0.26"
},
{
"label": "3.32.2",
"value": "0.0.27"
} }
], ],
"required": true "required": true

View File

@@ -19,7 +19,7 @@
}, },
"xrayVersion": { "xrayVersion": {
"type": "string", "type": "string",
"defaultValue": "0.0.26", "defaultValue": "0.0.27",
"allowedValues": [ "allowedValues": [
"0.0.10", "0.0.10",
"0.0.11", "0.0.11",
@@ -34,7 +34,8 @@
"0.0.23", "0.0.23",
"0.0.24", "0.0.24",
"0.0.25", "0.0.25",
"0.0.26" "0.0.26",
"0.0.27"
], ],
"metadata": { "metadata": {
"description": "Xray-vm image version to deploy." "description": "Xray-vm image version to deploy."
@@ -297,7 +298,7 @@
{ {
"type": "Microsoft.Resources/deployments", "type": "Microsoft.Resources/deployments",
"name": "deploySQLDB", "name": "deploySQLDB",
"apiVersion": "2019-09-01", "apiVersion": "2020-06-01",
"properties": { "properties": {
"mode": "Incremental", "mode": "Incremental",
"templateLink": { "templateLink": {

View File

@@ -33,7 +33,7 @@
"value": "10.0.1.0/24" "value": "10.0.1.0/24"
}, },
"xrayVersion": { "xrayVersion": {
"value": "0.0.26" "value": "0.0.27"
}, },
"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.26", "defaultValue": "0.0.27",
"allowedValues": [ "allowedValues": [
"0.0.10", "0.0.10",
"0.0.11", "0.0.11",
@@ -34,7 +34,8 @@
"0.0.23", "0.0.23",
"0.0.24", "0.0.24",
"0.0.25", "0.0.25",
"0.0.26" "0.0.26",
"0.0.27"
], ],
"metadata": { "metadata": {
"description": "Xray-vm image version to deploy." "description": "Xray-vm image version to deploy."
@@ -202,7 +203,7 @@
"joinKey": "[parameters('joinKey')]", "joinKey": "[parameters('joinKey')]",
"osType": { "osType": {
"publisher": "jfrog", "publisher": "jfrog",
"offer": "x-ray-vm-preview", "offer": "x-ray-vm",
"sku": "x-ray-vm", "sku": "x-ray-vm",
"version": "[parameters('xrayVersion')]" "version": "[parameters('xrayVersion')]"
}, },
@@ -338,7 +339,7 @@
"plan": { "plan": {
"name": "x-ray-vm", "name": "x-ray-vm",
"publisher": "jfrog", "publisher": "jfrog",
"product": "x-ray-vm-preview" "product": "x-ray-vm"
}, },
"sku": { "sku": {
"name": "[parameters('virtualMachineSize')]", "name": "[parameters('virtualMachineSize')]",