Use Ubuntu host image (#837)

anamnavi · web-flow · commit 8949770212a5 · 2024-11-05T10:59:56.000-05:00
diff --git a/.pipelines/PowerShell-Docker-Image-Build-Official.yml b/.pipelines/PowerShell-Docker-Image-Build-Official.yml
@@ -21,7 +21,7 @@ variables:
 - name: DisableDockerDetector
   value: true
 - name: LinuxContainerImage
-  value: mcr.microsoft.com/onebranch/cbl-mariner/build:2.0
+  value: onebranch.azurecr.io/linux/ubuntu-2004:latest
 - name: WindowsContainerImage
   value: onebranch.azurecr.io/windows/ltsc2019/vse2022:latest
 - name: ob_sdl_sbom_enabled
@@ -42,6 +42,10 @@ extends:
   parameters:
     featureFlags:
       runHostSDL: true
+      # Work around regression in OneBranch docker builds
+      needExceptionForUbuntuUsage: true
+      LinuxHostVersion:
+        Distribution: Ubuntu
     customTags: 'ES365AIMigrationTooling-BulkMigrated'
     stages:
     - stage: StageResolveVersionandYaml
diff --git a/.pipelines/PowerShell-Docker-Image-Release-Official.yml b/.pipelines/PowerShell-Docker-Image-Release-Official.yml
@@ -225,6 +225,9 @@ extends:
           demands:
           - ImageOverride -equals PSMMSUbuntu20.04-Secure-120GB
         steps:
+          - checkout: self
+            clean: true
+            lfs: false
           - task: DownloadPipelineArtifact@2
             inputs:
               targetPath: $(Pipeline.Workspace)
diff --git a/.vsts-ci/releaseJob.yml b/.vsts-ci/releaseJob.yml
@@ -128,12 +128,6 @@ jobs:
       targetPath: $(Build.SourcesDirectory)/dst/$(dockerBuildImageName)
       artifact: drop_StageGenerateBuild_${{ parameters.channel }}_Job_PreBuild_${{ parameters.archName }}_${{ parameters.artifactSuffix }}
     displayName: 'Download artifact to which Dockerfile was uploaded'
-  - task: onebranch.pipeline.containercontrol@1
-    displayName: "Login to source ACR"
-    inputs:
-      command: login
-      acr_name: $(ACRName)
-      tenant: MSFT
   - task: onebranch.pipeline.imagebuildinfo@1
     displayName: image build
     inputs:
