diff --git a/.pipelines/build/generate-manifest.steps.yaml b/.pipelines/build/generate-manifest.steps.yaml index 5077e99a73..7065eed0bc 100644 --- a/.pipelines/build/generate-manifest.steps.yaml +++ b/.pipelines/build/generate-manifest.steps.yaml @@ -12,7 +12,7 @@ steps: .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 }' | \ + { image: .imageReference, annotate: (.args | join(" ")) }' | \ jq -rcs) echo >&2 "##vso[task.setvariable variable=MANIFEST_JSON;isOutput=true]$MANIFEST_DATA" echo "$MANIFEST_DATA" | jq -r . diff --git a/.pipelines/build/image.steps.yaml b/.pipelines/build/image.steps.yaml index 28ec223990..e8403a6241 100644 --- a/.pipelines/build/image.steps.yaml +++ b/.pipelines/build/image.steps.yaml @@ -33,6 +33,7 @@ parameters: default: - "--target $(os) " - "--platform $(os)/$(arch) " + - "--provenance false " - name: common_build_args type: object diff --git a/.pipelines/build/images.jobs.yaml b/.pipelines/build/images.jobs.yaml index 7589f20e9e..9d107b0b03 100644 --- a/.pipelines/build/images.jobs.yaml +++ b/.pipelines/build/images.jobs.yaml @@ -112,8 +112,8 @@ jobs: pool: os: linux type: docker -# ${{ if eq(job_data.job, 'linux_arm64') }}: -# hostArchitecture: arm64 + ${{ if eq(job_data.job, 'linux_arm64') }}: + hostArchitecture: arm64 # ${{ else }}: # LinuxHostVersion: 'AzLinux3.0AMD64' variables: @@ -127,12 +127,10 @@ jobs: OS: linux ${{ elseif eq(job_data.job, 'windows_amd64') }}: LinuxContainerImage: 'mcr.microsoft.com/onebranch/azurelinux/build:3.0' - ob_enable_qemu: true ARCH: amd64 OS: windows ${{ elseif eq(job_data.job, 'linux_arm64') }}: LinuxContainerImage: 'mcr.microsoft.com/onebranch/azurelinux/build:3.0' - ob_enable_qemu: true ARCH: arm64 OS: linux GOARCH: arm64