File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ variables:
2121- name : DisableDockerDetector
2222 value : true
2323- name : LinuxContainerImage
24- value : mcr.microsoft.com/onebranch/cbl-mariner/build:2.0
24+ value : onebranch.azurecr.io/linux/ubuntu-2004:latest
2525- name : WindowsContainerImage
2626 value : onebranch.azurecr.io/windows/ltsc2019/vse2022:latest
2727- name : ob_sdl_sbom_enabled
@@ -42,6 +42,10 @@ extends:
4242 parameters :
4343 featureFlags :
4444 runHostSDL : true
45+ # Work around regression in OneBranch docker builds
46+ needExceptionForUbuntuUsage : true
47+ LinuxHostVersion :
48+ Distribution : Ubuntu
4549 customTags : ' ES365AIMigrationTooling-BulkMigrated'
4650 stages :
4751 - stage : StageResolveVersionandYaml
Original file line number Diff line number Diff line change @@ -225,6 +225,9 @@ extends:
225225 demands :
226226 - ImageOverride -equals PSMMSUbuntu20.04-Secure-120GB
227227 steps :
228+ - checkout : self
229+ clean : true
230+ lfs : false
228231 - task : DownloadPipelineArtifact@2
229232 inputs :
230233 targetPath : $(Pipeline.Workspace)
Original file line number Diff line number Diff line change @@ -128,12 +128,6 @@ jobs:
128128 targetPath : $(Build.SourcesDirectory)/dst/$(dockerBuildImageName)
129129 artifact : drop_StageGenerateBuild_${{ parameters.channel }}_Job_PreBuild_${{ parameters.archName }}_${{ parameters.artifactSuffix }}
130130 displayName : ' Download artifact to which Dockerfile was uploaded'
131- - task : onebranch.pipeline.containercontrol@1
132- displayName : " Login to source ACR"
133- inputs :
134- command : login
135- acr_name : $(ACRName)
136- tenant : MSFT
137131 - task : onebranch.pipeline.imagebuildinfo@1
138132 displayName : image build
139133 inputs :
You can’t perform that action at this time.
0 commit comments