fixup! Update Variables to Generated Values

Author: sheylatrudo

.pipelines/build/generate-manifest.steps.yaml

@@ -11,6 +11,7 @@ steps:
       jq -r '.[] | 
         .args = [ (.platform | split("/")[0]), (.platform     | split("/")[1]) ] | 
         .args = [ ("--os "   + .args[0]     ), ("--arch " + .args[1]     ) ] | 
+        if .osVersion then .args += ["--os-version " + .osVersion] else . end    |
         { image: .imageReference, annotate: .args }' | \
       jq -rcs)
     echo >&2 "##vso[task.setvariable variable=MANIFEST_JSON;isOutput=true]$MANIFEST_DATA"

.pipelines/run-pipeline.yaml

@@ -116,8 +116,8 @@ stages:
         type: docker
       variables:
         LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2204:latest'
-        ob_outputDirectory: $(Build.SourcesDirectory)/out
-        ob_artifactSuffix: _$(name)_linux_amd64
+        ob_outputDirectory: $(Build.SourcesDirectory)/out/images/$(os)-$(arch)
+        ob_artifactSuffix: _$(name)
 
         ARCH: amd64
         OS: linux
@@ -177,8 +177,8 @@ stages:
         type: docker
       variables:
         LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2204:latest'
-        ob_outputDirectory: $(Build.SourcesDirectory)/out
-        ob_artifactSuffix: _$(name)_windows_amd64
+        ob_outputDirectory: $(Build.SourcesDirectory)/out/images/$(os)-$(arch)
+        ob_artifactSuffix: _$(name)
         ob_enable_qemu: true
 
         ARCH: amd64
@@ -233,8 +233,8 @@ stages:
         hostArchitecture: arm64
       variables:
         LinuxContainerImage: 'onebranch.azurecr.io/linux/ubuntu-2004-arm64:latest'
-        ob_outputDirectory: $(Build.SourcesDirectory)/out
-        ob_artifactSuffix: _$(name)_linux_arm64
+        ob_outputDirectory: $(Build.SourcesDirectory)/out/images/$(os)-$(arch)
+        ob_artifactSuffix: _$(name)
         ob_build_container: true
 
         ARCH: arm64
@@ -340,7 +340,6 @@ stages:
             - platform: linux/arm64
               imageReference: $(IPAM_LINUX_ARM64_REF)
             - platform: windows/amd64
-              osVersion: ltsc2022
               imageReference: $(IPAM_WINDOWS_AMD64_REF)
         - job: cni
           templateContext:
@@ -352,7 +351,6 @@ stages:
             - platform: linux/arm64
               imageReference: $(CNI_LINUX_ARM64_REF)
             - platform: windows/amd64
-              osVersion: ltsc2022
               imageReference: $(CNI_WINDOWS_AMD64_REF)
         - job: cns
           templateContext:
@@ -364,7 +362,6 @@ stages:
             - platform: linux/arm64
               imageReference: $(CNS_LINUX_ARM64_REF)
             - platform: windows/amd64
-              osVersion: ltsc2022
               imageReference: $(CNS_WINDOWS_AMD64_REF)
         - job: ipv6_hp_bpf
           templateContext:
@@ -385,7 +382,6 @@ stages:
             - platform: linux/arm64
               imageReference: $(NPM_LINUX_ARM64_REF)
             - platform: windows/amd64
-              osVersion: ltsc2022
               imageReference: $(NPM_WINDOWS_AMD64_REF)