From f043771adecf0cad2dfb754a7c666231911ddbe8 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Wed, 9 Jul 2025 08:13:04 -0700 Subject: [PATCH] Update eng/common with latest --- eng/common/templates/steps/annotate-eol-digests.yml | 2 +- eng/common/templates/variables/docker-images.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/common/templates/steps/annotate-eol-digests.yml b/eng/common/templates/steps/annotate-eol-digests.yml index 35646b26..e6306bc5 100644 --- a/eng/common/templates/steps/annotate-eol-digests.yml +++ b/eng/common/templates/steps/annotate-eol-digests.yml @@ -38,7 +38,7 @@ steps: tenantId: $(marStatus.serviceConnection.tenantId) clientId: $(marStatus.serviceConnection.clientId) internalProjectName: internal - condition: and(succeeded(), eq(variables['publishEolAnnotations'], 'true')) + condition: and(succeeded(), eq(variables['publishEolAnnotations'], 'true'), eq(variables['waitForIngestionEnabled'], 'true')) args: >- waitForMarAnnotationIngestion $(artifactsPath)/annotation-digests/annotation-digests.txt diff --git a/eng/common/templates/variables/docker-images.yml b/eng/common/templates/variables/docker-images.yml index a2f8fa91..83141ef4 100644 --- a/eng/common/templates/variables/docker-images.yml +++ b/eng/common/templates/variables/docker-images.yml @@ -1,5 +1,5 @@ variables: - imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2727330 + imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2744543 imageNames.imageBuilder: $(imageNames.imageBuilderName) imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId) imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux3.0-docker-testrunner