delete mariner2 test-deps, update buildHelper func to populate poolHostVersion, and update channel based ReleaseStage.yml files (#807)

Author: anamnavi

.vsts-ci/ltsReleaseStage.yml

@@ -106,7 +106,6 @@ stages:
       imageName: nanoserver1809
       artifactSuffix: nanoserver1809
       poolOS: 'windows'
-      poolHostArchitecture: 'amd64'
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
@@ -116,7 +115,8 @@ stages:
       imageName: nanoserver2022
       artifactSuffix: nanoserver2022
       poolOS: 'windows'
-      poolHostArchitecture: 'amd64'
+      poolHostVersion: '1ESWindows2022'
+      windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
@@ -126,7 +126,8 @@ stages:
       imageName: windowsserver2022
       artifactSuffix: windowsserver2022
       poolOS: 'windows'
-      poolHostArchitecture: 'amd64'
+      poolHostVersion: '1ESWindows2022'
+      windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
@@ -136,7 +137,8 @@ stages:
       imageName: windowsservercore2022
       artifactSuffix: windowsservercore2022
       poolOS: 'windows'
-      poolHostArchitecture: 'amd64'
+      poolHostVersion: '1ESWindows2022'
+      windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
@@ -170,16 +172,6 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: mariner2\test-deps
-      artifactSuffix: mariner2_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releasePhase.yml@self
     parameters:
       archName: 'Build_linux_amd64'

.vsts-ci/previewReleaseStage.yml

@@ -136,7 +136,8 @@ stages:
       imageName: windowsserver2022
       artifactSuffix: windowsserver2022
       poolOS: 'windows'
-      poolHostArchitecture: 'amd64'
+      poolHostVersion: '1ESWindows2022'
+      windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
@@ -146,7 +147,8 @@ stages:
       imageName: windowsservercore2022
       artifactSuffix: windowsservercore2022
       poolOS: 'windows'
-      poolHostArchitecture: 'amd64'
+      poolHostVersion: '1ESWindows2022'
+      windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
@@ -190,16 +192,6 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: mariner2\test-deps
-      artifactSuffix: mariner2_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releasePhase.yml@self
     parameters:
       archName: 'Build_linux_amd64'

.vsts-ci/stableReleaseStage.yml

@@ -136,7 +136,8 @@ stages:
       imageName: windowsserver2022
       artifactSuffix: windowsserver2022
       poolOS: 'windows'
-      poolHostArchitecture: 'amd64'
+      poolHostVersion: '1ESWindows2022'
+      windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
@@ -146,7 +147,8 @@ stages:
       imageName: windowsservercore2022
       artifactSuffix: windowsservercore2022
       poolOS: 'windows'
-      poolHostArchitecture: 'amd64'
+      poolHostVersion: '1ESWindows2022'
+      windowsContainerImageValue: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest'
       maxParallel: 3
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
@@ -190,16 +192,6 @@ stages:
       buildKitValue: 1
       channel: ${{ parameters.channel }}
       channelPath: ${{ parameters.channelPath }}
-  - template: /.vsts-ci/releasePhase.yml@self
-    parameters:
-      archName: 'Build_linux_amd64'
-      imageName: mariner2\test-deps
-      artifactSuffix: mariner2_test_deps
-      poolOS: 'linux'
-      poolHostArchitecture: 'amd64'
-      buildKitValue: 1
-      channel: ${{ parameters.channel }}
-      channelPath: ${{ parameters.channelPath }}
   - template: /.vsts-ci/releasePhase.yml@self
     parameters:
       archName: 'Build_linux_amd64'

release/7-2/mariner2/meta.json

@@ -7,7 +7,6 @@
         {"Tag": "2.0"}
     ],
     "ShortDistroName": "mariner",
-    "SubImage": "test-deps",
     "TestProperties": {
         "size": 387
     },

release/7-2/mariner2/test-deps/docker/Dockerfile

@@ -7,7 +7,6 @@
         {"Tag": "2.0"}
     ],
     "ShortDistroName": "mariner",
-    "SubImage": "test-deps",
     "TestProperties": {
         "size": 332
     },

release/7-2/mariner2/test-deps/meta.json

@@ -7,7 +7,6 @@
         {"Tag": "2.0"}
     ],
     "ShortDistroName": "mariner",
-    "SubImage": "test-deps",
     "TestProperties": {
         "size": 335
     },