From 49edd8780eaed940208dcf0c974545c7e72b770f Mon Sep 17 00:00:00 2001
From: Jimmy Fitzsimmons <44599392+jimmyfit@users.noreply.github.com>
Date: Sat, 9 Jul 2022 17:10:17 +1000
Subject: [PATCH 1/3] Update windowsImageIds to reference image, not version

---
 arm-cloudsoe-image.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arm-cloudsoe-image.json b/arm-cloudsoe-image.json
index 44bdc71..74fd9ec 100644
--- a/arm-cloudsoe-image.json
+++ b/arm-cloudsoe-image.json
@@ -3025,14 +3025,14 @@
             "type": "array",
             "copy": {
                 "count": "[length(parameters('buildImages'))]",
-                "input": "[if(equals(variables('imagePropertiesSet')[parameters('buildImages')[copyIndex()]].osType,'Windows'),reference(concat('AIBImageBuild-',copyIndex())).outputs.artifactId,null())]"
+                "input": "[if(equals(variables('imagePropertiesSet')[parameters('buildImages')[copyIndex()]].osType,'Windows'),resourceId('Microsoft.Compute/galleries/images','CloudSOESIG',variables('imagePropertiesSet')[parameters('buildImages')[copyIndex()]].soeSku),null())]"
             }
         },
         "linuxImageIds": {
             "type": "array",
             "copy": {
                 "count": "[length(parameters('buildImages'))]",
-                "input": "[if(equals(variables('imagePropertiesSet')[parameters('buildImages')[copyIndex()]].osType,'Linux'),reference(concat('AIBImageBuild-',copyIndex())).outputs.artifactId,null())]"
+                "input": "[if(equals(variables('imagePropertiesSet')[parameters('buildImages')[copyIndex()]].osType,'Linux'),resourceId('Microsoft.Compute/galleries/images','CloudSOESIG',variables('imagePropertiesSet')[parameters('buildImages')[copyIndex()]].soeSku),null())]"
             }
         }
     }

From ccd5116f0af5ac13c012cd9520a1f1ce5cc7c8f9 Mon Sep 17 00:00:00 2001
From: Jimmy Fitzsimmons <44599392+jimmyfit@users.noreply.github.com>
Date: Sat, 9 Jul 2022 17:11:20 +1000
Subject: [PATCH 2/3] Go faster

---
 arm-cloudsoe-image.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arm-cloudsoe-image.json b/arm-cloudsoe-image.json
index 74fd9ec..b8e7fe8 100644
--- a/arm-cloudsoe-image.json
+++ b/arm-cloudsoe-image.json
@@ -3012,7 +3012,7 @@
                 "arguments": "[concat(resourceGroup().name, ' ', variables('imagePropertiesSet')[parameters('buildImages')[copyIndex()]].soeSku, ' ', concat('BuildOutput-',copyIndex()))]",
                 "scriptContent": "
                     az login --identity
-                    az image builder run -g $1 -n $2
+                    az image builder run -g $1 -n $2 --no-wait
                     az image builder show-runs -g $1 -n $2 --output-name $3 > $AZ_SCRIPTS_OUTPUT_PATH
                 ",
                 "cleanupPreference": "OnSuccess",

From 8a6f5e5d8704bc46604a0fd3ce3fc28bd3bf636b Mon Sep 17 00:00:00 2001
From: Jimmy Fitzsimmons <44599392+jimmyfit@users.noreply.github.com>
Date: Sat, 9 Jul 2022 17:25:38 +1000
Subject: [PATCH 3/3] Remove output

---
 arm-cloudsoe-image.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arm-cloudsoe-image.json b/arm-cloudsoe-image.json
index b8e7fe8..51521f7 100644
--- a/arm-cloudsoe-image.json
+++ b/arm-cloudsoe-image.json
@@ -3013,7 +3013,6 @@
                 "scriptContent": "
                     az login --identity
                     az image builder run -g $1 -n $2 --no-wait
-                    az image builder show-runs -g $1 -n $2 --output-name $3 > $AZ_SCRIPTS_OUTPUT_PATH
                 ",
                 "cleanupPreference": "OnSuccess",
                 "retentionInterval": "P1D"