Added a new Extract_PR_Number job to parse the PR number from System.PullRequest.SourceBranch

Author: shubhadapaithankar

.pipelines/ci.yml

@@ -39,8 +39,6 @@ variables:
 stages:
   - stage: Containerized_CI
     variables:
-      - name: PR_NUMBER
-        value: ""
       - name: TAG
         value: ""
     jobs:
@@ -50,33 +48,39 @@ stages:
         steps:
           # Debugging: Output the SourceBranch value
           - bash: |
+              echo "DEBUG: Inspecting System.PullRequest.SourceBranch..."
               echo "System.PullRequest.SourceBranch is: $(System.PullRequest.SourceBranch)"
               echo "System.PullRequest.SourceCommitId is: $(System.PullRequest.SourceCommitId)"
-              echo "##vso[task.logissue type=warning] Debug output: Source Branch: $(System.PullRequest.SourceBranch), Commit SHA: $(System.PullRequest.SourceCommitId)"
+              echo "##vso[task.logissue type=warning] Source Branch: $(System.PullRequest.SourceBranch)"
             displayName: Debug Source Branch Information
 
-          # Extract PR Number
+          # Extract PR Number with fallback logic
           - bash: |
               echo "Extracting PR Number from Source Branch..."
               PR_NUMBER=$(echo $(System.PullRequest.SourceBranch) | grep -oP '(?<=refs/pull/)\d+(?=/merge)')
               
-              # Check if extraction succeeded
+              # Handle case when PR_NUMBER is not extracted
               if [ -z "$PR_NUMBER" ]; then
-                echo "##vso[task.logissue type=error] Failed to extract PR number. Please verify the branch name format: $(System.PullRequest.SourceBranch)"
-                exit 1
+                  echo "##vso[task.logissue type=error] Failed to extract PR number. Branch format: $(System.PullRequest.SourceBranch)"
+                  exit 1
               fi
-
               echo "Extracted PR Number: $PR_NUMBER"
               echo "##vso[task.setvariable variable=PR_NUMBER]$PR_NUMBER"
-            displayName: Extract PR Number from Source Branch
-
-          # Generate TAG Variable
-          - bash: |
-              echo "Generating TAG variable..."
+              
+              # Generate TAG variable
               TAG=pr-$(PR_NUMBER)-$(System.PullRequest.SourceCommitId)
               echo "Generated TAG: $TAG"
               echo "##vso[task.setvariable variable=TAG]$TAG"
-            displayName: Generate Image Tag
+            displayName: Extract PR Number and Generate TAG
+
+      - job: Build_Test_And_Push_Az_ARO_Extension
+        dependsOn: Extract_PR_Number
+        variables:
+          TAG: $(TAG)
+        pool:
+          name: 1es-aro-ci-pool
+        steps:
+          - template: ./templates/template-checkout.yml
 
           # Build and test the Az ARO Extension
           - script: |
@@ -90,9 +94,12 @@ stages:
               acrFQDN: 'arosvcdev.azurecr.io'
               repository: 'azext-aro'
               tag: $(TAG)
-              pushLatest: true
+              pushLatest: false
 
       - job: Build_And_Test_RP_And_Portal
+        dependsOn: Extract_PR_Number
+        variables:
+          TAG: $(TAG)
         pool:
           name: 1es-aro-ci-pool
         steps:
@@ -104,31 +111,18 @@ stages:
               DOCKER_BUILD_CI_ARGS="--load" make ci-rp VERSION=$(TAG)
             displayName: 🛠 Build & Test RP and Portal
 
-          # Publish test results
-          - task: PublishTestResults@2
-            displayName: 📊 Publish tests results
-            inputs:
-              testResultsFiles: $(System.DefaultWorkingDirectory)/report.xml
-            condition: succeededOrFailed()
-
-          # Publish code coverage results
-          - task: PublishCodeCoverageResults@2
-            displayName: 📈 Publish code coverage
-            inputs:
-              codeCoverageTool: Cobertura
-              summaryFileLocation: $(System.DefaultWorkingDirectory)/coverage.xml
-              failIfCoverageEmpty: false
-            condition: succeededOrFailed()
-
           # Push the RP image to ACR
           - template: ./templates/template-acr-push.yml
             parameters:
               acrFQDN: 'arosvcdev.azurecr.io'
               repository: 'aro'
               tag: $(TAG)
-              pushLatest: true
+              pushLatest: false
 
       - job: Build_And_Push_E2E_Image
+        dependsOn: Extract_PR_Number
+        variables:
+          TAG: $(TAG)
         pool:
           name: 1es-aro-ci-pool
         steps:
@@ -146,7 +140,8 @@ stages:
               acrFQDN: 'arosvcdev.azurecr.io'
               repository: 'e2e'
               tag: $(TAG)
-              pushLatest: true
+              pushLatest: false
+
 
   - stage: E2E  # E2E Stage using Docker Compose
     dependsOn: Containerized_CI