Use CopyTask

Author: Evans Aboge (from Dev Box)

.azure-pipelines/ci-build.yml

@@ -7,7 +7,6 @@ trigger:
     include:
     - main
     - support/v1
-    - task/move-to-deploy-stage
   tags:
     include:
     - 'v*'
@@ -16,15 +15,14 @@ pr:
     include:
     - main
     - support/v1
-    - task/move-to-deploy-stage
 
 variables:
   buildPlatform: 'Any CPU'
   buildConfiguration: 'Release'
   ProductBinPath: '$(Build.SourcesDirectory)\src\Microsoft.OpenApi\bin\$(BuildConfiguration)'
   REGISTRY: 'msgraphpperegistry.azurecr.io'
   IMAGE_NAME: 'public/openapi/hidi'
-  PREVIEW_BRANCH: 'refs/heads/task/move-to-deploy-stage'
+  PREVIEW_BRANCH: 'refs/heads/main'
 
 resources:
   repositories:
@@ -55,6 +53,14 @@ extends:
             displayName: 'Publish Artifact: RepoFiles'
             artifactName: RepoFiles
             targetPath: '$(Build.ArtifactStagingDirectory)/RepoFiles'
+          - output: pipelineArtifact
+            displayName: 'Publish Artifact: DockerImage'
+            artifactName: DockerImage
+            targetPath: '$(Build.ArtifactStagingDirectory)/DockerImage'
+          - output: pipelineArtifact
+            displayName: 'Publish Artifact: ImageConfig'
+            artifactName: ImageConfig
+            targetPath: '$(Build.ArtifactStagingDirectory)/ImageConfig'
         steps:
         - task: UseDotNet@2
           displayName: 'Use .NET 6'
@@ -230,21 +236,35 @@ extends:
             # Extract run number
             runNumber=$(echo "$(Build.BuildNumber)" | grep -o '[0-9]\+$' || date +"%S%N" | cut -c1-3)
             echo "##vso[task.setvariable variable=RUNNUMBER]$runNumber"
+            
+            # Create directories for Docker image artifacts and config
+            mkdir -p "$(Build.ArtifactStagingDirectory)/DockerImage"
+            mkdir -p "$(Build.ArtifactStagingDirectory)/ImageConfig"
+            
+            # Save configuration for deploy stage
+            echo "$versionInfo" > "$(Build.ArtifactStagingDirectory)/ImageConfig/version.txt"
+            echo "$buildDate" > "$(Build.ArtifactStagingDirectory)/ImageConfig/builddate.txt"
+            echo "$runNumber" > "$(Build.ArtifactStagingDirectory)/ImageConfig/runnumber.txt"
+            echo "$(Build.SourceBranch)" > "$(Build.ArtifactStagingDirectory)/ImageConfig/sourcebranch.txt"
           displayName: 'Extract version and build info'
         
         - bash: |
             # Create image tag based on branch/tag
             if [[ "$(Build.SourceBranch)" == "$(PREVIEW_BRANCH)" ]]; then
               # For main branch
               IMAGE_TAGS="--tag $(REGISTRY)/$(IMAGE_NAME):nightly --tag $(REGISTRY)/$(IMAGE_NAME):$(VERSION).$(BUILDDATE)$(RUNNUMBER)"
+              echo "nightly" > "$(Build.ArtifactStagingDirectory)/ImageConfig/imagetype.txt"
             elif [[ "$(Build.SourceBranch)" == refs/tags/v* ]]; then
               # For release tags
               IMAGE_TAGS="--tag $(REGISTRY)/$(IMAGE_NAME):latest --tag $(REGISTRY)/$(IMAGE_NAME):$(VERSION)"
+              echo "release" > "$(Build.ArtifactStagingDirectory)/ImageConfig/imagetype.txt"
             else
               # For other branches/PRs
               IMAGE_TAGS="--tag $(REGISTRY)/$(IMAGE_NAME):$(VERSION).$(BUILDDATE)$(RUNNUMBER)"
+              echo "branch" > "$(Build.ArtifactStagingDirectory)/ImageConfig/imagetype.txt"
             fi
             
+            echo "$IMAGE_TAGS" > "$(Build.ArtifactStagingDirectory)/ImageConfig/imagetags.txt"
             echo "##vso[task.setvariable variable=IMAGE_TAGS]$IMAGE_TAGS"
           displayName: 'Set Docker image tags'
         
@@ -261,11 +281,26 @@ extends:
             # Build image with BuildX but don't push yet - save to local tar file
             docker buildx build \
               --platform linux/amd64,linux/arm64/v8 \
-              --output "type=docker,dest=$(Build.ArtifactStagingDirectory)/docker-image.tar" \
+              --output "type=docker,dest=$(Build.ArtifactStagingDirectory)/DockerImage/docker-image.tar" \
               $(IMAGE_TAGS) \
               $(Build.SourcesDirectory)
           displayName: 'Build Docker image and save to artifact'
         
+        # Copy Docker image to staging directory using CopyFiles
+        - task: CopyFiles@2
+          displayName: 'Prepare Docker image for upload'
+          inputs:
+            sourceFolder: $(Build.ArtifactStagingDirectory)/DockerImage
+            contents: '**/*'
+            targetFolder: $(Build.ArtifactStagingDirectory)/DockerImage
+        
+        # Copy Docker image config to staging directory
+        - task: CopyFiles@2
+          displayName: 'Prepare Docker image config for upload'
+          inputs:
+            sourceFolder: $(Build.ArtifactStagingDirectory)/ImageConfig
+            contents: '**/*'
+            targetFolder: $(Build.ArtifactStagingDirectory)/ImageConfig
         - task: PublishPipelineArtifact@1
           displayName: 'Publish Docker Image Artifact'
           inputs:
@@ -425,7 +460,7 @@ extends:
                 - task: AzureCLI@2
                   displayName: 'Login to Azure Container Registry'
                   inputs:
-                    azureSubscription: 'ACR Images Push Service Connection'
+                    azureSubscription: 'ACR Push Test'
                     scriptType: bash
                     scriptLocation: inlineScript
                     inlineScript: |