Skip to content

Commit 902b4a1

Browse files
committed
azure-arm-template: set CustomScriptExtension output
We want to know the output that the CustomScriptExtension gives us, so let's output it from the ARM template. That way, we can access it from the azure/arm-deploy GitHub Action in a follow-up commit. Signed-off-by: Dennis Ameling <[email protected]>
1 parent ba380bc commit 902b4a1

File tree

1 file changed

+26
-24
lines changed

1 file changed

+26
-24
lines changed

azure-self-hosted-runners/azure-arm-template.json

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,12 @@
108108
"nicName": "[concat(parameters('virtualMachineName'), '-nic')]",
109109
"vnetName": "[concat(parameters('virtualMachineName'), '-vnet')]",
110110
"vnetId": "[resourceId(resourceGroup().name,'Microsoft.Network/virtualNetworks', concat(parameters('virtualMachineName'), '-vnet'))]",
111-
"subnetRef": "[concat(variables('vnetId'), '/subnets/', parameters('subnetName'))]"
111+
"subnetRef": "[concat(variables('vnetId'), '/subnets/', parameters('subnetName'))]",
112+
"UriFileNamePieces": "[split(parameters('postDeploymentPsScriptUrl'), '/')]",
113+
"firstFileNameString": "[variables('UriFileNamePieces')[sub(length(variables('UriFileNamePieces')), 1)]]",
114+
"firstFileNameBreakString": "[split(variables('firstFileNameString'), '?')]",
115+
"firstFileName": "[variables('firstFileNameBreakString')[0]]",
116+
"postDeploymentScriptArguments": "[concat('-GitHubActionsRunnerToken ', parameters('githubActionsRunnerToken'), ' -GithubActionsRunnerRegistrationUrl ', parameters('githubActionsRunnerRegistrationUrl'), ' -GithubActionsRunnerName ', parameters('virtualMachineName'), ' -StopService ', parameters('stopService'), ' -GitHubActionsRunnerPath ', parameters('githubActionsRunnerPath'))]"
112117
},
113118
"resources": [
114119
{
@@ -243,38 +248,35 @@
243248
]
244249
},
245250
{
246-
"name": "Microsoft.CustomScriptExtension",
247-
"apiVersion": "2015-01-01",
248-
"type": "Microsoft.Resources/deployments",
251+
"type": "Microsoft.Compute/virtualMachines/extensions",
252+
"apiVersion": "2020-12-01",
253+
"name": "[concat(parameters('virtualMachineName'), '/CustomScriptExtension')]",
254+
"dependsOn": [
255+
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('virtualMachineName'))]"
256+
],
257+
"location": "[parameters('location')]",
249258
"properties": {
250-
"mode": "incremental",
251-
"templateLink": {
252-
"uri": "https://catalogartifact.azureedge.net/publicartifacts/Microsoft.CustomScriptExtension-arm-2.0.57/MainTemplate.json"
259+
"publisher": "Microsoft.Compute",
260+
"type": "CustomScriptExtension",
261+
"typeHandlerVersion": "1.9",
262+
"autoUpgradeMinorVersion": true,
263+
"settings": {
264+
"fileUris": "[split(parameters('postDeploymentPsScriptUrl'), ' ')]"
253265
},
254-
"parameters": {
255-
"fileUris": {
256-
"value": "[parameters('postDeploymentPsScriptUrl')]"
257-
},
258-
"vmName": {
259-
"value": "[parameters('virtualMachineName')]"
260-
},
261-
"location": {
262-
"value": "[parameters('location')]"
263-
},
264-
"arguments": {
265-
"value": "[concat('-GitHubActionsRunnerToken ', parameters('githubActionsRunnerToken'), ' -GithubActionsRunnerRegistrationUrl ', parameters('githubActionsRunnerRegistrationUrl'), ' -GithubActionsRunnerName ', parameters('virtualMachineName'), ' -StopService ', parameters('stopService'), ' -GitHubActionsRunnerPath ', parameters('githubActionsRunnerPath'))]"
266-
}
266+
"protectedSettings": {
267+
"commandToExecute": "[concat('powershell -ExecutionPolicy Unrestricted -File ', variables('firstFileName'), ' ', variables('postDeploymentScriptArguments'))]"
267268
}
268-
},
269-
"dependsOn": [
270-
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('virtualMachineName'))]"
271-
]
269+
}
272270
}
273271
],
274272
"outputs": {
275273
"adminUsername": {
276274
"type": "string",
277275
"value": "[parameters('adminUsername')]"
276+
},
277+
"customScriptInstanceView": {
278+
"type": "object",
279+
"value": "[reference(resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('virtualMachineName'), 'CustomScriptExtension')).instanceView]"
278280
}
279281
}
280282
}

0 commit comments

Comments
 (0)