Move to deploy stage

Author: Evans Aboge (from Dev Box)

.azure-pipelines/ci-build.yml

@@ -7,6 +7,7 @@ trigger:
     include:
     - main
     - support/v1
+    - task/move-to-deploy-stage
   tags:
     include:
     - 'v*'
@@ -15,14 +16,15 @@ 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: 'msgraphprodregistry.azurecr.io'
+  REGISTRY: 'msgraphpperegistry.azurecr.io'
   IMAGE_NAME: 'public/openapi/hidi'
-  PREVIEW_BRANCH: 'refs/heads/main'
+  PREVIEW_BRANCH: 'refs/heads/task/move-to-deploy-stage'
 
 resources:
   repositories:
@@ -203,18 +205,79 @@ extends:
             sourceFolder: $(Build.ArtifactStagingDirectory)
             content: '*.nupkg'
 
-        # Copy repository files to be used in the deploy stage
-        - task: CopyFiles@2
-          displayName: 'Copy repository files for deploy stage'
-          inputs:
-            SourceFolder: '$(Build.SourcesDirectory)'
-            Contents: |
-              **/*
-              !**/bin/**
-              !**/obj/**
-              !**/.git/**
-            TargetFolder: '$(Build.ArtifactStagingDirectory)/RepoFiles'
+        # Instead of copying repository files, build Docker images here
+        - script: |
+            docker run --privileged --rm tonistiigi/binfmt --install all
+          displayName: "Enable multi-platform builds"
+
+        - script: |
+            docker buildx create --use --name mybuilder
+          displayName: "Set up Docker BuildX"
 
+        - script: |
+            docker buildx inspect --bootstrap
+          displayName: "Ensure BuildX is working"
+        
+        - bash: |
+            # Extract version from project properties
+            versionInfo=$(pwsh -Command "(Get-Content '$(Build.SourcesDirectory)/Directory.Build.props' | Select-String -Pattern '<Version>(.*)</Version>').Matches.Groups[1].Value")
+            echo "##vso[task.setvariable variable=VERSION]$versionInfo"
+            
+            # Get date for tagging
+            buildDate=$(date +'%Y%m%d')
+            echo "##vso[task.setvariable variable=BUILDDATE]$buildDate"
+            
+            # Extract run number
+            runNumber=$(echo "$(Build.BuildNumber)" | grep -o '[0-9]\+$' || date +"%S%N" | cut -c1-3)
+            echo "##vso[task.setvariable variable=RUNNUMBER]$runNumber"
+          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)"
+            elif [[ "$(Build.SourceBranch)" == refs/tags/v* ]]; then
+              # For release tags
+              IMAGE_TAGS="--tag $(REGISTRY)/$(IMAGE_NAME):latest --tag $(REGISTRY)/$(IMAGE_NAME):$(VERSION)"
+            else
+              # For other branches/PRs
+              IMAGE_TAGS="--tag $(REGISTRY)/$(IMAGE_NAME):$(VERSION).$(BUILDDATE)$(RUNNUMBER)"
+            fi
+            
+            echo "##vso[task.setvariable variable=IMAGE_TAGS]$IMAGE_TAGS"
+          displayName: 'Set Docker image tags'
+        
+        - task: AzureCLI@2
+          displayName: 'Login to Azure Container Registry'
+          inputs:
+            azureSubscription: 'ACR Push Test'
+            scriptType: bash
+            scriptLocation: inlineScript
+            inlineScript: |
+              az acr login --name msgraphpperegistry
+        
+        - bash: |
+            # 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" \
+              $(IMAGE_TAGS) \
+              $(Build.SourcesDirectory)
+          displayName: 'Build Docker image and save to artifact'
+        
+        - task: PublishPipelineArtifact@1
+          displayName: 'Publish Docker Image Artifact'
+          inputs:
+            targetPath: '$(Build.ArtifactStagingDirectory)/docker-image.tar'
+            artifactName: 'DockerImage'
+        
+        - task: PublishPipelineArtifact@1
+          displayName: 'Publish Image Tag Info'
+          inputs:
+            targetPath: '$(Build.ArtifactStagingDirectory)'
+            artifactName: 'ImageBuildInfo'
+            
     - stage: deploy
       condition: and(or(contains(variables['Build.SourceBranch'], 'refs/tags/v'), eq(variables['Build.SourceBranch'], variables['PREVIEW_BRANCH'])), succeeded())
       dependsOn: build
@@ -348,8 +411,11 @@ extends:
           isProduction: true
           inputs:
           - input: pipelineArtifact
-            artifactName: RepoFiles
-            targetPath: '$(Pipeline.Workspace)'
+            artifactName: DockerImage
+            targetPath: '$(Pipeline.Workspace)/DockerImage'
+          - input: pipelineArtifact
+            artifactName: ImageBuildInfo
+            targetPath: '$(Pipeline.Workspace)/ImageBuildInfo'
         strategy:
           runOnce:
             deploy:
@@ -363,110 +429,20 @@ extends:
                     scriptType: bash
                     scriptLocation: inlineScript
                     inlineScript: |
-                      az acr login --name msgraphprodregistry
-              
-                - powershell: |
-                    $content = [XML](Get-Content $(Pipeline.Workspace)/Directory.Build.props)
-                    Write-Host "XML loaded, finding version..."
-                    
-                    # Handle PropertyGroup as either a single element or array
-                    $version = $null
-                    if ($content.Project.PropertyGroup -is [array]) {
-                      Write-Host "PropertyGroup is an array, checking each entry..."
-                      foreach ($pg in $content.Project.PropertyGroup) {
-                        if ($pg.Version) {
-                          $version = $pg.Version.ToString().Trim()
-                          Write-Host "Found version in PropertyGroup array: $version"
-                          break
-                        }
-                      }
-                    } else {
-                      # Single PropertyGroup
-                      $version = $content.Project.PropertyGroup.Version
-                      if ($version) {
-                        $version = $version.ToString().Trim()
-                        Write-Host "Found version in PropertyGroup: $version"
-                      }
-                    }
-                    
-                    if (-not $version) {
-                      Write-Host "##vso[task.logissue type=error]Version not found in Directory.Build.props"
-                      exit 1
-                    }
-                    
-                    Write-Host "Version found: $version" 
-                    Write-Host "##vso[task.setvariable variable=version;isoutput=true]$version"
-                    Write-Host "##vso[task.setvariable variable=VERSION]$version"
-                  displayName: 'Get version from csproj'
-                  name: getversion
+                      az acr login --name msgraphpperegistry
                 
                 - bash: |
-                    # Debug output to verify version variable
-                    echo "Version from previous step: $VERSION"
-                  displayName: 'Verify version variable'
-                
-                - bash: |
-                    echo "Build Number: $(Build.BuildNumber)"
-                    # Extract the last 3 characters for the run number
-                    runnumber=$(echo "$(Build.BuildNumber)" | grep -o '[0-9]\+$')
-                    echo "Extracted Run Number: $runnumber"
+                    # Load the Docker image from tar file
+                    docker load < $(Pipeline.Workspace)/DockerImage/docker-image.tar
                     
-                    # If extraction fails, set a default
-                    if [ -z "$runnumber" ]; then
-                      echo "Extraction failed, using default value"
-                      runnumber=$(date +"%S%N" | cut -c1-3)
-                      echo "Generated fallback run number: $runnumber"
+                    # Push the image tags
+                    if [[ "$(Build.SourceBranch)" == "$(PREVIEW_BRANCH)" ]]; then
+                      docker push $(REGISTRY)/$(IMAGE_NAME):nightly
+                      docker push $(REGISTRY)/$(IMAGE_NAME):$(VERSION).$(BUILDDATE)$(RUNNUMBER)
+                    elif [[ "$(Build.SourceBranch)" == refs/tags/v* ]]; then
+                      docker push $(REGISTRY)/$(IMAGE_NAME):latest
+                      docker push $(REGISTRY)/$(IMAGE_NAME):$(VERSION)
+                    else
+                      docker push $(REGISTRY)/$(IMAGE_NAME):$(VERSION).$(BUILDDATE)$(RUNNUMBER)
                     fi
-                    
-                    # Set the variable for later steps
-                    echo "##vso[task.setvariable variable=RUNNUMBER]$runnumber"
-                    echo "##vso[task.setvariable variable=RUNNUMBER;isOutput=true]$runnumber"
-                  displayName: 'Get truncated run number'
-                  name: getrunnumber
-                  condition: eq(variables['Build.SourceBranch'], variables['PREVIEW_BRANCH'])
-                  
-                - bash: |
-                    date=$(date +'%Y%m%d')
-                    echo "Date value: $date"
-                    echo "##vso[task.setvariable variable=BUILDDATE;isOutput=true]$date"
-                    echo "##vso[task.setvariable variable=BUILDDATE]$date"
-                  displayName: 'Get current date'
-                  name: setdate
-                  condition: eq(variables['Build.SourceBranch'], variables['PREVIEW_BRANCH'])
-                
-                - script: |
-                    docker run --privileged --rm tonistiigi/binfmt --install all
-                  displayName: "Enable multi-platform builds"
-
-                - script: |
-                    docker buildx create --use --name mybuilder
-                  displayName: "Set up Docker BuildX"
-
-                - script: |
-                    docker buildx inspect --bootstrap
-                  displayName: "Ensure BuildX is working"
-                
-                - bash: |
-                    echo "Building Docker image..."
-                    echo "Using build date: ${BUILDDATE}"
-                    # Using quotes around tags to prevent flag interpretation
-                    docker buildx build \
-                      --platform linux/amd64,linux/arm64/v8 \
-                      --push \
-                      -t "$(REGISTRY)/$(IMAGE_NAME):nightly" \
-                      -t "$(REGISTRY)/$(IMAGE_NAME):${VERSION}.${BUILDDATE}${RUNNUMBER}" \
-                      "$(Pipeline.Workspace)"
-
-                  displayName: 'Build and Push Nightly Image'
-                  condition: eq(variables['Build.SourceBranch'], variables['PREVIEW_BRANCH'])
-                
-                - bash: |
-                    echo "Building Docker image for release..."
-                    docker buildx build\
-                      --platform linux/amd64,linux/arm64/v8 \
-                      --push \
-                      -t "$(REGISTRY)/$(IMAGE_NAME):latest" \
-                      -t "$(REGISTRY)/$(IMAGE_NAME):${VERSION}.${BUILDDATE}${RUNNUMBER}" \
-                      "$(Pipeline.Workspace)"
-                  displayName: 'Build and Push Release Image'
-                  condition: contains(variables['Build.SourceBranch'], 'refs/tags/v')
+                  displayName: 'Push Docker Image to Registry'