From 6e9bd33a0fa430e6e9150a1fb72a0184f99f3de4 Mon Sep 17 00:00:00 2001 From: Anup Singh <64248163+anupteal@users.noreply.github.com> Date: Thu, 16 Sep 2021 23:11:36 +0530 Subject: [PATCH] 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 --- .../MP_submission/createUiDefinition.json | 6 +++++- .../MP_submission/mainTemplate.json | 21 ++++++++++++++++--- .../Artifactory/azuredeploy.json | 5 +++-- .../MP_submission/createUiDefinition.json | 6 +++++- .../Xray/MP_submission/mainTemplate.json | 7 ++++--- .../Xray/azuredeploy_xray.parameters.json | 2 +- .../Xray/azuredeploy_xray_vmss.json | 9 ++++---- 7 files changed, 41 insertions(+), 15 deletions(-) diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json index f35ed86..e934d63 100644 --- a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json +++ b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json @@ -132,7 +132,7 @@ "name": "artifactoryVersion", "type": "Microsoft.Common.DropDown", "label": "Artifactory-vm image version to deploy.", - "defaultValue": "7.24.3", + "defaultValue": "7.25.6", "toolTip": "Version of Artifactory to deploy", "constraints": { "allowedValues": [ @@ -187,6 +187,10 @@ { "label": "7.24.3", "value": "0.0.25" + }, + { + "label": "7.25.6", + "value": "0.0.27" } ], "required": true diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json index abf78fb..c8eaa36 100644 --- a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json +++ b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json @@ -79,7 +79,7 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.25", + "defaultValue": "0.0.27", "allowedValues": [ "0.0.8", "0.0.9", @@ -93,7 +93,8 @@ "0.0.21", "0.0.22", "0.0.23", - "0.0.25" + "0.0.25", + "0.0.27" ], "metadata": { "description": "Artifactory-vm image version to deploy." @@ -314,6 +315,20 @@ "nsgName": "[concat(variables('namingInfix'), 'nsg')]" }, "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", "location": "[parameters('location')]", @@ -723,7 +738,7 @@ { "type": "Microsoft.Resources/deployments", "name": "deploySQLDB", - "apiVersion": "2019-09-01", + "apiVersion": "2020-06-01", "properties": { "mode": "Incremental", "templateLink": { diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json index 24ae66d..ef7a09e 100644 --- a/AzureResourceManager/Artifactory/azuredeploy.json +++ b/AzureResourceManager/Artifactory/azuredeploy.json @@ -79,7 +79,7 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.25", + "defaultValue": "0.0.27", "allowedValues": [ "0.0.8", "0.0.9", @@ -93,7 +93,8 @@ "0.0.21", "0.0.22", "0.0.23", - "0.0.25" + "0.0.25", + "0.0.27" ], "metadata": { "description": "Artifactory-vm image version to deploy." diff --git a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json index f29a002..f687cc6 100644 --- a/AzureResourceManager/Xray/MP_submission/createUiDefinition.json +++ b/AzureResourceManager/Xray/MP_submission/createUiDefinition.json @@ -123,7 +123,7 @@ "name": "xrayVersion", "type": "Microsoft.Common.DropDown", "label": "Xray-vm image version to deploy.", - "defaultValue": "3.29.2", + "defaultValue": "3.32.2", "toolTip": "Version of Xray to deploy", "constraints": { "allowedValues": [ @@ -182,6 +182,10 @@ { "label": "3.29.2", "value": "0.0.26" + }, + { + "label": "3.32.2", + "value": "0.0.27" } ], "required": true diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json index 2f135d2..c5583c3 100644 --- a/AzureResourceManager/Xray/MP_submission/mainTemplate.json +++ b/AzureResourceManager/Xray/MP_submission/mainTemplate.json @@ -19,7 +19,7 @@ }, "xrayVersion": { "type": "string", - "defaultValue": "0.0.26", + "defaultValue": "0.0.27", "allowedValues": [ "0.0.10", "0.0.11", @@ -34,7 +34,8 @@ "0.0.23", "0.0.24", "0.0.25", - "0.0.26" + "0.0.26", + "0.0.27" ], "metadata": { "description": "Xray-vm image version to deploy." @@ -297,7 +298,7 @@ { "type": "Microsoft.Resources/deployments", "name": "deploySQLDB", - "apiVersion": "2019-09-01", + "apiVersion": "2020-06-01", "properties": { "mode": "Incremental", "templateLink": { diff --git a/AzureResourceManager/Xray/azuredeploy_xray.parameters.json b/AzureResourceManager/Xray/azuredeploy_xray.parameters.json index c593434..fbaa10e 100644 --- a/AzureResourceManager/Xray/azuredeploy_xray.parameters.json +++ b/AzureResourceManager/Xray/azuredeploy_xray.parameters.json @@ -33,7 +33,7 @@ "value": "10.0.1.0/24" }, "xrayVersion": { - "value": "0.0.26" + "value": "0.0.27" }, "artifactoryURL": { "value": "http://ARTIFACTORY-URL.cloudapp.azure.com" diff --git a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json index ec277cf..43f7891 100644 --- a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json +++ b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json @@ -19,7 +19,7 @@ }, "xrayVersion": { "type": "string", - "defaultValue": "0.0.26", + "defaultValue": "0.0.27", "allowedValues": [ "0.0.10", "0.0.11", @@ -34,7 +34,8 @@ "0.0.23", "0.0.24", "0.0.25", - "0.0.26" + "0.0.26", + "0.0.27" ], "metadata": { "description": "Xray-vm image version to deploy." @@ -202,7 +203,7 @@ "joinKey": "[parameters('joinKey')]", "osType": { "publisher": "jfrog", - "offer": "x-ray-vm-preview", + "offer": "x-ray-vm", "sku": "x-ray-vm", "version": "[parameters('xrayVersion')]" }, @@ -338,7 +339,7 @@ "plan": { "name": "x-ray-vm", "publisher": "jfrog", - "product": "x-ray-vm-preview" + "product": "x-ray-vm" }, "sku": { "name": "[parameters('virtualMachineSize')]",