Skip to content

Commit 18c7d4d

Browse files
authored
Merge pull request #16 from vdice/ci/arm-ttk
ci(*): test marketplace package with arm-ttk; fix errs
2 parents e87870f + 07aab95 commit 18c7d4d

File tree

3 files changed

+19
-11
lines changed

3 files changed

+19
-11
lines changed

.github/workflows/marketplace-verify.yaml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,20 @@ jobs:
2222
cd marketplace
2323
cpa verify
2424
25-
# TODO(vdice): We could also utilize the ARM template test kit
26-
# to verify the mainTemplate.json and createUIDefinition.json files:
27-
# https://learn.microsoft.com/en-us/azure/azure-resource-manager/templates/test-toolkit#validate-templates-for-azure-marketplace
25+
arm-ttk:
26+
name: Test marketplace templates
27+
runs-on: ubuntu-22.04
28+
steps:
29+
- uses: actions/checkout@v3
30+
31+
- name: install arm-ttk
32+
run: |
33+
curl -sSLo arm-ttk.zip https://github.com/Azure/arm-ttk/releases/download/20240328/arm-ttk.zip
34+
unzip arm-ttk.zip
35+
36+
- name: test marketplace package
37+
shell: pwsh
38+
run: |
39+
Set-Location arm-ttk/arm-ttk
40+
Import-Module ./arm-ttk.psd1
41+
Test-AzMarketplacePackage -TemplatePath ../../marketplace

marketplace/createUIDefinition.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@
202202
"min": 1,
203203
"max": 10,
204204
"label": "VMCount",
205-
"subLabel": "",
206205
"defaultValue": 1,
207206
"showStepMarkers": false,
208207
"toolTip": "Specify VM count",

marketplace/mainTemplate.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@
144144
"name": "[parameters('clusterResourceName')]",
145145
"location": "[parameters('location')]",
146146
"dependsOn": [],
147-
"tags": {},
148147
"sku": {
149148
"name": "Basic",
150149
"tier": "Free"
@@ -171,9 +170,7 @@
171170
"type": "VirtualMachineScaleSets",
172171
"mode": "System",
173172
"maxPods": 110,
174-
"availabilityZones": [],
175-
"enableNodePublicIP": false,
176-
"tags": {}
173+
"enableNodePublicIP": false
177174
}
178175
],
179176
"networkProfile": {
@@ -203,9 +200,7 @@
203200
"properties": {
204201
"extensionType": "[variables('clusterExtensionTypeName')]",
205202
"autoUpgradeMinorVersion": true,
206-
"releaseTrain": "[variables('releaseTrain')]",
207-
"configurationSettings": {},
208-
"configurationProtectedSettings": {}
203+
"releaseTrain": "[variables('releaseTrain')]"
209204
},
210205
"plan": {
211206
"name": "[variables('plan-name')]",

0 commit comments

Comments
 (0)