Refactor integration test conditions to improve branch logic handling and normalize output variable for DSC resource tests

Author: johlju

azure-pipelines.yml

@@ -91,28 +91,30 @@ stages:
             inputs:
               targetType: 'inline'
               script: |
-                # Set the target branch for comparison
-                if ($env:SYSTEM_PULLREQUEST_TARGETBRANCH) {
+                # Determine if we should run DSC resource integration tests based on branch logic
+                $shouldRun = $false
+
+                if ($env:SYSTEM_PULLREQUEST_TARGETBRANCH)
+                {
                     $targetBranch = "origin/$env:SYSTEM_PULLREQUEST_TARGETBRANCH"
-                } else {
-                    $targetBranch = "origin/$(defaultBranch)"
+                    Write-Host "Pull request detected, branch $targetBranch. Using script analysis to determine test requirements."
+                    $shouldRun = ./.build/Test-ShouldRunDscResourceIntegrationTests.ps1 -BaseBranch $targetBranch -CurrentBranch 'HEAD'
+                }
+                elseif ($env:BUILD.SOURCEBRANCHNAME) -eq '$(defaultBranch)'')
+                {
+                    Write-Host "Target is default branch ($(defaultBranch)). Always running DSC resource integration tests."
+                    $shouldRun = $true
+                }
+                else
+                {
+                    Write-Host "Target is non-default branch ($env:BUILD.SOURCEBRANCH). Using script analysis to determine test requirements against default branch."
+                    $shouldRun = ./.build/Test-ShouldRunDscResourceIntegrationTests.ps1 -BaseBranch 'origin/main' -CurrentBranch $env:BUILD.SOURCEBRANCH
                 }
-
-                Write-Output "Target branch: $targetBranch"
-                Write-Output "Current branch: HEAD"
-
-                # Run the script to determine if DSC resource integration tests should run
-                $shouldRun = ./.build/Test-ShouldRunDscResourceIntegrationTests.ps1 -BaseBranch $targetBranch -CurrentBranch HEAD
-
-                # Debug: print computed value before exporting as output
-                Write-Host "Computed ShouldRunDscResourceIntegrationTests: $shouldRun"
-
-                # Normalize to lowercase string so conditions can use a simple string comparison
-                $shouldRunNormalized = ([string] $shouldRun).ToLower()
-                Write-Host "Normalized ShouldRunDscResourceIntegrationTests: $shouldRunNormalized"
 
                 # Set Azure DevOps output variable for pipeline conditions
-                Write-Host "##vso[task.setvariable variable=ShouldRunDscResourceIntegrationTests;isOutput=true]$shouldRunNormalized"
+                Write-Host "##vso[task.setvariable variable=ShouldRunDscResourceIntegrationTests;isOutput=true]$shouldRun"
+
+                Write-Host "Variable ShouldRunDscResourceIntegrationTests is set to: $shouldRun"
               pwsh: true
 
       - job: Test_HQRM
@@ -447,7 +449,7 @@ stages:
     condition: |
       and(
         succeeded(),
-        eq(dependencies.Quality_Test_and_Unit_Test.outputs['Determine_DSC_Resource_Test_Requirements.determineDscResourceTests.ShouldRunDscResourceIntegrationTests'], 'true')
+        eq(lower(dependencies.Quality_Test_and_Unit_Test.outputs['Determine_DSC_Resource_Test_Requirements.determineDscResourceTests.ShouldRunDscResourceIntegrationTests']), 'true')
       )
     jobs:
       - job: Test_Integration
@@ -545,7 +547,7 @@ stages:
     condition: |
       and(
         succeeded(),
-        eq(dependencies.Quality_Test_and_Unit_Test.outputs['Determine_DSC_Resource_Test_Requirements.determineDscResourceTests.ShouldRunDscResourceIntegrationTests'], 'true')
+        eq(lower(dependencies.Quality_Test_and_Unit_Test.outputs['Determine_DSC_Resource_Test_Requirements.determineDscResourceTests.ShouldRunDscResourceIntegrationTests']), 'true')
       )
     jobs:
       - job: Test_Integration
@@ -640,7 +642,7 @@ stages:
     condition: |
       and(
         succeeded(),
-        eq(dependencies.Quality_Test_and_Unit_Test.outputs['Determine_DSC_Resource_Test_Requirements.determineDscResourceTests.ShouldRunDscResourceIntegrationTests'], 'true')
+        eq(lower(dependencies.Quality_Test_and_Unit_Test.outputs['Determine_DSC_Resource_Test_Requirements.determineDscResourceTests.ShouldRunDscResourceIntegrationTests']), 'true')
       )
     jobs:
       - job: Test_Integration
@@ -716,7 +718,7 @@ stages:
     condition: |
       and(
         succeeded(),
-        eq(dependencies.Quality_Test_and_Unit_Test.outputs['Determine_DSC_Resource_Test_Requirements.determineDscResourceTests.ShouldRunDscResourceIntegrationTests'], 'true')
+        eq(lower(dependencies.Quality_Test_and_Unit_Test.outputs['Determine_DSC_Resource_Test_Requirements.determineDscResourceTests.ShouldRunDscResourceIntegrationTests']), 'true')
       )
     jobs:
       - job: Test_Integration
@@ -783,7 +785,7 @@ stages:
     condition: |
       and(
         succeeded(),
-        eq(dependencies.Quality_Test_and_Unit_Test.outputs['Determine_DSC_Resource_Test_Requirements.determineDscResourceTests.ShouldRunDscResourceIntegrationTests'], 'true')
+        eq(lower(dependencies.Quality_Test_and_Unit_Test.outputs['Determine_DSC_Resource_Test_Requirements.determineDscResourceTests.ShouldRunDscResourceIntegrationTests']), 'true')
       )
     jobs:
       - job: Test_Integration