diff --git a/eng/common/templates/jobs/publish.yml b/eng/common/templates/jobs/publish.yml index 9b8e8617..3920beef 100644 --- a/eng/common/templates/jobs/publish.yml +++ b/eng/common/templates/jobs/publish.yml @@ -28,8 +28,6 @@ jobs: value: $(artifactsPath)/imageInfo - name: sourceBuildIdOutputDir value: $(Build.ArtifactStagingDirectory)/sourceBuildId - - name: imageInfoRawContentUrl - value: https://raw.githubusercontent.com/$(gitHubVersionsRepoInfo.org)/$(gitHubVersionsRepoInfo.repo)/$(gitHubVersionsRepoInfo.branch)/$(gitHubImageInfoVersionsPath) - ${{ parameters.customPublishVariables }} steps: - template: /eng/common/templates/steps/retain-build.yml@self @@ -106,10 +104,8 @@ jobs: parameters: dryRunArg: $(dryRunArg) condition: and(succeeded(), eq(variables['publishReadme'], 'true')) - - script: | - mkdir -p $(Build.ArtifactStagingDirectory)/eol-annotation-data - curl -fSL --output $(Build.ArtifactStagingDirectory)/eol-annotation-data/image-info-old.json $(imageInfoRawContentUrl) - displayName: Download Original Image Info File + - script: mkdir -p $(Build.ArtifactStagingDirectory)/eol-annotation-data + displayName: Create EOL Annotation Data Directory - script: > $(runImageBuilderCmd) publishImageInfo '$(imageInfoContainerDir)/image-info.json' @@ -120,12 +116,12 @@ jobs: --git-repo '$(gitHubVersionsRepoInfo.repo)' --git-branch '$(gitHubVersionsRepoInfo.branch)' --git-path '$(gitHubImageInfoVersionsPath)' + --image-info-orig-path '$(artifactsPath)/eol-annotation-data/image-info-old.json' + --image-info-update-path '$(artifactsPath)/eol-annotation-data/image-info-new.json' $(dryRunArg) $(imageBuilder.commonCmdArgs) condition: and(succeeded(), eq(variables['publishImageInfo'], 'true')) displayName: Publish Image Info - - script: curl -fSL --output $(Build.ArtifactStagingDirectory)/eol-annotation-data/image-info-new.json $(imageInfoRawContentUrl) - displayName: Download Updated Image Info File - template: /eng/common/templates/steps/run-imagebuilder.yml@self parameters: displayName: Ingest Kusto Image Info @@ -154,8 +150,8 @@ jobs: '$(artifactsPath)/eol-annotation-data/eol-annotation-data.json' '$(artifactsPath)/eol-annotation-data/image-info-old.json' '$(artifactsPath)/eol-annotation-data/image-info-new.json' - '$(publishRepoPrefix)' '$(acr.server)' + '$(publishRepoPrefix)' $(generateEolAnnotationDataExtraOptions) $(dryRunArg) - template: /eng/common/templates/steps/publish-artifact.yml@self diff --git a/eng/common/templates/variables/docker-images.yml b/eng/common/templates/variables/docker-images.yml index 29ea5de0..949c53d7 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:2532486 + imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2543116 imageNames.imageBuilder: $(imageNames.imageBuilderName) imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId) imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner2.0-docker-testrunner