From bdb39894a51089e7379461d7733b603933da026d Mon Sep 17 00:00:00 2001 From: Anup Singh <64248163+anupteal@users.noreply.github.com> Date: Wed, 20 Oct 2021 21:48:25 +0530 Subject: [PATCH 1/8] Update azuredeploy.parameters.json --- AzureResourceManager/Artifactory/azuredeploy.parameters.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AzureResourceManager/Artifactory/azuredeploy.parameters.json b/AzureResourceManager/Artifactory/azuredeploy.parameters.json index d20e929..f55c8ce 100644 --- a/AzureResourceManager/Artifactory/azuredeploy.parameters.json +++ b/AzureResourceManager/Artifactory/azuredeploy.parameters.json @@ -12,7 +12,7 @@ "value": "OWERWRITE_THE_PASSWORD" }, "db_type": { - "value": "Postgresql_deploy.json" + "value": "MSSQL_deploy.json" }, "db_user": { "value": "artifactory" @@ -65,4 +65,4 @@ "value": "" } } -} \ No newline at end of file +} From 2e55f3c3ef0e75d13d1ea7677381b38bdd019397 Mon Sep 17 00:00:00 2001 From: Anup Singh <64248163+anupteal@users.noreply.github.com> Date: Thu, 21 Oct 2021 18:24:34 +0530 Subject: [PATCH 2/8] Update azuredeploy.json --- AzureResourceManager/Artifactory/azuredeploy.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json index 7898c95..d7c97dd 100644 --- a/AzureResourceManager/Artifactory/azuredeploy.json +++ b/AzureResourceManager/Artifactory/azuredeploy.json @@ -307,7 +307,7 @@ "artifactoryLicense5": "[parameters('artifactoryLicense5')]", "osType": { "publisher": "jfrog", - "offer": "artifactory-vm", + "offer": "artifactory-vm-preview", "sku": "artifactory-vm", "version": "[parameters('artifactoryVersion')]" }, @@ -775,7 +775,7 @@ "plan": { "name": "artifactory-vm", "publisher": "jfrog", - "product": "artifactory-vm" + "product": "artifactory-vm-preview" }, "sku": { "name": "[parameters('vmSku')]", @@ -872,7 +872,7 @@ "plan": { "name": "artifactory-vm", "publisher": "jfrog", - "product": "artifactory-vm" + "product": "artifactory-vm-preview" }, "sku": { "name": "[parameters('vmSku')]", From 9fe1cc307e5748bd739db39266da38711f30ef1c Mon Sep 17 00:00:00 2001 From: Anup Singh <64248163+anupteal@users.noreply.github.com> Date: Thu, 21 Oct 2021 19:03:22 +0530 Subject: [PATCH 3/8] Update azuredeploy.parameters.json --- AzureResourceManager/Artifactory/azuredeploy.parameters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AzureResourceManager/Artifactory/azuredeploy.parameters.json b/AzureResourceManager/Artifactory/azuredeploy.parameters.json index f55c8ce..0fa1e2f 100644 --- a/AzureResourceManager/Artifactory/azuredeploy.parameters.json +++ b/AzureResourceManager/Artifactory/azuredeploy.parameters.json @@ -12,7 +12,7 @@ "value": "OWERWRITE_THE_PASSWORD" }, "db_type": { - "value": "MSSQL_deploy.json" + "value": "Postgresql_deploy.json" }, "db_user": { "value": "artifactory" From 1962341ec3f902b078ee4f75815a188cc63367d9 Mon Sep 17 00:00:00 2001 From: Anup Singh <64248163+anupteal@users.noreply.github.com> Date: Mon, 25 Oct 2021 18:51:32 +0530 Subject: [PATCH 4/8] Update azuredeploy.json --- AzureResourceManager/Artifactory/azuredeploy.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json index d7c97dd..7898c95 100644 --- a/AzureResourceManager/Artifactory/azuredeploy.json +++ b/AzureResourceManager/Artifactory/azuredeploy.json @@ -307,7 +307,7 @@ "artifactoryLicense5": "[parameters('artifactoryLicense5')]", "osType": { "publisher": "jfrog", - "offer": "artifactory-vm-preview", + "offer": "artifactory-vm", "sku": "artifactory-vm", "version": "[parameters('artifactoryVersion')]" }, @@ -775,7 +775,7 @@ "plan": { "name": "artifactory-vm", "publisher": "jfrog", - "product": "artifactory-vm-preview" + "product": "artifactory-vm" }, "sku": { "name": "[parameters('vmSku')]", @@ -872,7 +872,7 @@ "plan": { "name": "artifactory-vm", "publisher": "jfrog", - "product": "artifactory-vm-preview" + "product": "artifactory-vm" }, "sku": { "name": "[parameters('vmSku')]", From aa059eaf986d84ab64fea916a5a42e660dc38cd3 Mon Sep 17 00:00:00 2001 From: Anup Singh <64248163+anupteal@users.noreply.github.com> Date: Mon, 25 Oct 2021 19:58:12 +0530 Subject: [PATCH 5/8] Update azuredeploy_xray.parameters.json --- AzureResourceManager/Xray/azuredeploy_xray.parameters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AzureResourceManager/Xray/azuredeploy_xray.parameters.json b/AzureResourceManager/Xray/azuredeploy_xray.parameters.json index 9cc5703..d2b3777 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.28" + "value": "0.0.29" }, "artifactoryURL": { "value": "http://ARTIFACTORY-URL.cloudapp.azure.com" From 49b809a690ad084e5786afd7ccdacbf96794d34c Mon Sep 17 00:00:00 2001 From: Anup Singh <64248163+anupteal@users.noreply.github.com> Date: Mon, 25 Oct 2021 19:59:23 +0530 Subject: [PATCH 6/8] Update azuredeploy_xray_vmss.json --- AzureResourceManager/Xray/azuredeploy_xray_vmss.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json index 16f4873..c67dbb0 100644 --- a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json +++ b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json @@ -204,7 +204,7 @@ "joinKey": "[parameters('joinKey')]", "osType": { "publisher": "jfrog", - "offer": "x-ray-vm", + "offer": "x-ray-vm-preview", "sku": "x-ray-vm", "version": "[parameters('xrayVersion')]" }, @@ -340,7 +340,7 @@ "plan": { "name": "x-ray-vm", "publisher": "jfrog", - "product": "x-ray-vm" + "product": "x-ray-vm-preview" }, "sku": { "name": "[parameters('virtualMachineSize')]", From 5ec5c5a76b76f98bb6a05a2ab071543a00b82091 Mon Sep 17 00:00:00 2001 From: Anup Singh <64248163+anupteal@users.noreply.github.com> Date: Mon, 25 Oct 2021 21:25:49 +0530 Subject: [PATCH 7/8] Update azuredeploy_xray_vmss.json --- AzureResourceManager/Xray/azuredeploy_xray_vmss.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json index c67dbb0..f7e99ee 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.28", + "defaultValue": "0.0.29", "allowedValues": [ "0.0.10", "0.0.11", @@ -36,7 +36,8 @@ "0.0.25", "0.0.26", "0.0.27", - "0.0.28" + "0.0.28", + "0.0.29" ], "metadata": { "description": "Xray-vm image version to deploy." From a4efffcd6ccca65cec562f54a3bc6b48cc12a71e Mon Sep 17 00:00:00 2001 From: anupteal Date: Wed, 27 Oct 2021 21:42:34 +0530 Subject: [PATCH 8/8] updated all changes for artifactory 7.27.6 & xray 3.34.1 --- .../Artifactory/MP_submission/createUiDefinition.json | 6 +++++- .../Artifactory/MP_submission/mainTemplate.json | 5 +++-- AzureResourceManager/Artifactory/azuredeploy.json | 5 +++-- .../Xray/MP_submission/createUiDefinition.json | 6 +++++- AzureResourceManager/Xray/MP_submission/mainTemplate.json | 5 +++-- AzureResourceManager/Xray/azuredeploy_xray_vmss.json | 4 ++-- 6 files changed, 21 insertions(+), 10 deletions(-) diff --git a/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json b/AzureResourceManager/Artifactory/MP_submission/createUiDefinition.json index 9870c59..65aec99 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.27.3", + "defaultValue": "7.27.6", "toolTip": "Version of Artifactory to deploy", "constraints": { "allowedValues": [ @@ -199,6 +199,10 @@ { "label": "7.27.3", "value": "0.0.29" + }, + { + "label": "7.27.6", + "value": "0.0.30" } ], "required": true diff --git a/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json b/AzureResourceManager/Artifactory/MP_submission/mainTemplate.json index 52108c8..649b325 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.29", + "defaultValue": "0.0.30", "allowedValues": [ "0.0.8", "0.0.9", @@ -96,7 +96,8 @@ "0.0.25", "0.0.27", "0.0.28", - "0.0.29" + "0.0.29", + "0.0.30" ], "metadata": { "description": "Artifactory-vm image version to deploy." diff --git a/AzureResourceManager/Artifactory/azuredeploy.json b/AzureResourceManager/Artifactory/azuredeploy.json index 7898c95..f18500f 100644 --- a/AzureResourceManager/Artifactory/azuredeploy.json +++ b/AzureResourceManager/Artifactory/azuredeploy.json @@ -79,7 +79,7 @@ }, "artifactoryVersion": { "type": "string", - "defaultValue": "0.0.29", + "defaultValue": "0.0.30", "allowedValues": [ "0.0.8", "0.0.9", @@ -96,7 +96,8 @@ "0.0.25", "0.0.27", "0.0.28", - "0.0.29" + "0.0.29", + "0.0.30" ], "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 59b67f3..ba8a398 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.33.3", + "defaultValue": "3.34.1", "toolTip": "Version of Xray to deploy", "constraints": { "allowedValues": [ @@ -190,6 +190,10 @@ { "label": "3.33.3", "value": "0.0.28" + }, + { + "label": "3.34.1", + "value": "0.0.29" } ], "required": true diff --git a/AzureResourceManager/Xray/MP_submission/mainTemplate.json b/AzureResourceManager/Xray/MP_submission/mainTemplate.json index bb52c5a..20b74ad 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.28", + "defaultValue": "0.0.29", "allowedValues": [ "0.0.10", "0.0.11", @@ -36,7 +36,8 @@ "0.0.25", "0.0.26", "0.0.27", - "0.0.28" + "0.0.28", + "0.0.29" ], "metadata": { "description": "Xray-vm image version to deploy." diff --git a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json index f7e99ee..6df01df 100644 --- a/AzureResourceManager/Xray/azuredeploy_xray_vmss.json +++ b/AzureResourceManager/Xray/azuredeploy_xray_vmss.json @@ -205,7 +205,7 @@ "joinKey": "[parameters('joinKey')]", "osType": { "publisher": "jfrog", - "offer": "x-ray-vm-preview", + "offer": "x-ray-vm", "sku": "x-ray-vm", "version": "[parameters('xrayVersion')]" }, @@ -341,7 +341,7 @@ "plan": { "name": "x-ray-vm", "publisher": "jfrog", - "product": "x-ray-vm-preview" + "product": "x-ray-vm" }, "sku": { "name": "[parameters('virtualMachineSize')]",