update download tasks

microsoft · Feb 4, 2024 · c11bb2d · c11bb2d
1 parent 4c91735
commit c11bb2d
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 57 deletions.
diff --git a/.pipelines/containerSourceData/yaml_files/BuildGoldenContainers.yml b/.pipelines/containerSourceData/yaml_files/BuildGoldenContainers.yml
@@ -366,27 +366,27 @@ stages:
       - task: DownloadPipelineArtifact@2
         displayName: 'Download $(baseContainerFile) - ${{ parameters.architecture }}'
         inputs:
-          buildType: specific
-          project: mariner
-          definition: $(baseContainersPipelineId)
-          buildVersionToDownload: specific
-          pipelineId: $(baseContainersBuildId)
-          artifactName: $(artifactName)
-          itemPattern: $(containerArtifactDir)/$(baseContainerFile)
-          targetPath: $(artifactsDownloadDir)
+          source: specific
+          project: 'mariner'
+          pipeline: '$(baseContainersPipelineId)'
+          runVersion: specific
+          runId: $(baseContainersBuildId)
+          artifact: $(artifactName)
+          patterns: $(containerArtifactDir)/$(baseContainerFile)
+          path: '$(artifactsDownloadDir)'
         condition: eq(variables['proceed'], 'true')
 
       - task: DownloadPipelineArtifact@2
         displayName: 'Download $(rpmsTarball) - ${{ parameters.architecture }}'
         inputs:
-          buildType: specific
-          project: mariner
-          definition: $(baseContainersPipelineId)
-          buildVersionToDownload: specific
-          pipelineId: $(baseContainersBuildId)
-          artifactName: $(artifactName)
-          itemPattern: $(buildArtifactsDir)/$(rpmsTarball)
-          targetPath: $(artifactsDownloadDir)
+          source: specific
+          project: 'mariner'
+          pipeline: '$(baseContainersPipelineId)'
+          runVersion: specific
+          runId: $(baseContainersBuildId)
+          artifact: $(artifactName)
+          patterns: $(buildArtifactsDir)/$(rpmsTarball)
+          path: '$(artifactsDownloadDir)'
         condition: eq(variables['proceed'], 'true')
 
       - task: Bash@3

diff --git a/.pipelines/containerSourceData/yaml_files/BuildGoldenContainersValidation.yml b/.pipelines/containerSourceData/yaml_files/BuildGoldenContainersValidation.yml
@@ -27,14 +27,14 @@ stages:
     - task: DownloadPipelineArtifact@2
       displayName: 'Download $(buildConfigDir)'
       inputs:
-        buildType: specific
-        project: mariner
-        definition: $(baseContainersPipelineId)
-        buildVersionToDownload: specific
-        pipelineId: $(baseContainersBuildId)
-        artifactName: $(artifactName)
-        itemPattern: $(buildConfigDir)/*
-        targetPath: $(artifactsDownloadDir)
+        source: specific
+        project: 'mariner'
+        pipeline: '$(baseContainersPipelineId)'
+        runVersion: specific
+        runId: $(baseContainersBuildId)
+        artifact: $(artifactName)
+        patterns: $(buildConfigDir)/*
+        path: '$(artifactsDownloadDir)'
 
     - task: Bash@3
       displayName: 'Set Build Number'

diff --git a/.pipelines/containerSourceData/yaml_files/PublishContainers.yml b/.pipelines/containerSourceData/yaml_files/PublishContainers.yml
@@ -29,26 +29,26 @@ stages:
     - task: DownloadPipelineArtifact@2
       displayName: 'Download $(buildConfigDir) - AMD64'
       inputs:
-        buildType: specific
-        project: mariner
-        definition: $(amd64ContainersPipelineId)
-        buildVersionToDownload: specific
-        pipelineId: $(amd64ContainersBuildId)
-        artifactName: $(configArtifactName)
-        itemPattern: $(buildConfigDir)/*
-        targetPath: $(amd64ArtifactsDownloadDir)
+        source: specific
+        project: 'mariner'
+        pipeline: '$(amd64ContainersPipelineId)'
+        runVersion: specific
+        runId: $(amd64ContainersBuildId)
+        artifact: $(configArtifactName)
+        patterns: $(buildConfigDir)/*
+        path: '$(amd64ArtifactsDownloadDir)'
 
     - task: DownloadPipelineArtifact@2
       displayName: 'Download $(buildConfigDir) - ARM64'
       inputs:
-        buildType: specific
-        project: mariner
-        definition: $(arm64ContainersPipelineId)
-        buildVersionToDownload: specific
-        pipelineId: $(arm64ContainersBuildId)
-        artifactName: $(configArtifactName)
-        itemPattern: $(buildConfigDir)/*
-        targetPath: $(arm64ArtifactsDownloadDir)
+        source: specific
+        project: 'mariner'
+        pipeline: '$(arm64ContainersPipelineId)'
+        runVersion: specific
+        runId: $(arm64ContainersBuildId)
+        artifact: $(configArtifactName)
+        patterns: $(buildConfigDir)/*
+        path: '$(arm64ArtifactsDownloadDir)'
 
     - task: Bash@3
       displayName: 'Validate Build Numbers'
@@ -140,31 +140,30 @@ stages:
     - task: DownloadPipelineArtifact@2
       displayName: 'Download $(containerArtifactDir) - AMD64'
       inputs:
-        buildType: specific
-        project: mariner
-        definition: $(amd64ContainersPipelineId)
-        buildVersionToDownload: specific
-        pipelineId: $(amd64ContainersBuildId)
-        artifactName: $(containersArtifactName)
-        itemPattern: $(containerArtifactDir)/$(containerFilesPrefix)*$(containerFilesSuffix)
-        targetPath: $(amd64ArtifactsDownloadDir)
+        source: specific
+        project: 'mariner'
+        pipeline: '$(amd64ContainersPipelineId)'
+        runVersion: specific
+        runId: $(amd64ContainersBuildId)
+        artifact: $(containersArtifactName)
+        patterns: $(containerArtifactDir)/$(containerFilesPrefix)*$(containerFilesSuffix)
+        path: '$(amd64ArtifactsDownloadDir)'
 
     # This task's downloaded artifacts are not used.
     # It is just to implicitly validate that the corresponding ARM64 containers exist.
     # Some containers are only produced for AMD64 architecture.
     # Therefore, we can continue on error but would still like to direct attention to this task's failure.
     - task: DownloadPipelineArtifact@2
       displayName: 'Download $(containerArtifactDir) - ARM64'
-      continueOnError: True
       inputs:
-        buildType: specific
-        project: mariner
-        definition: $(arm64ContainersPipelineId)
-        buildVersionToDownload: specific
-        pipelineId: $(arm64ContainersBuildId)
-        artifactName: $(containersArtifactName)
-        itemPattern: $(containerArtifactDir)/$(containerFilesPrefix)*$(containerFilesSuffix)
-        targetPath: $(arm64ArtifactsDownloadDir)
+        source: specific
+        project: 'mariner'
+        pipeline: '$(arm64ContainersPipelineId)'
+        runVersion: specific
+        runId: $(arm64ContainersBuildId)
+        artifact: $(containersArtifactName)
+        patterns: $(containerArtifactDir)/$(containerFilesPrefix)*$(containerFilesSuffix)
+        path: '$(arm64ArtifactsDownloadDir)'
 
     - task: Bash@3
       displayName: 'Publish Containers'