Skip to content

Commit 558c3ad

Browse files
committed
Refactor DSC resource test output variables for consistency and clarity
1 parent 23e40bb commit 558c3ad

File tree

1 file changed

+18
-15
lines changed

1 file changed

+18
-15
lines changed

azure-pipelines.yml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -123,20 +123,23 @@ stages:
123123
pool:
124124
vmImage: 'windows-latest'
125125
variables:
126-
# Read the job output from the previous job via dependencies (both casings)
127-
ShouldRunUpper: $[ dependencies.Determine_DSC_Resource_Test_Requirements.outputs['determineDscResourceTests.ShouldRunDscResourceIntegrationTests'] ]
128-
ShouldRunLower: $[ dependencies.Determine_DSC_Resource_Test_Requirements.outputs['determinedscresourcetests.shouldrundscresourceintegrationtests'] ]
129-
ShouldRunShort: $[ dependencies.Determine_DSC_Resource_Test_Requirements.outputs['determinedscresourcetests.rundscresit'] ]
126+
# Use the correct output format: step_name.variable_name (both lowercase)
127+
ShouldRunMain: $[ dependencies.Determine_DSC_Resource_Test_Requirements.outputs['determineDscResourceTests.ShouldRunDscResourceIntegrationTests'] ]
128+
ShouldRunAlias: $[ dependencies.Determine_DSC_Resource_Test_Requirements.outputs['determineDscResourceTests.runDscResIT'] ]
130129
steps:
131130
- pwsh: |
132-
Write-Host "dependencies.Determine_DSC_Resource_Test_Requirements.outputs['determineDscResourceTests.ShouldRunDscResourceIntegrationTests'] = '$(ShouldRunUpper)'"
133-
Write-Host "dependencies.Determine_DSC_Resource_Test_Requirements.outputs['determinedscresourcetests.shouldrundscresourceintegrationtests'] = '$(ShouldRunLower)'"
134-
Write-Host "dependencies.Determine_DSC_Resource_Test_Requirements.outputs['determinedscresourcetests.rundscresit'] = '$(ShouldRunShort)'"
131+
Write-Host "Main output: '$(ShouldRunMain)'"
132+
Write-Host "Alias output: '$(ShouldRunAlias)'"
135133
136-
if ('$(ShouldRunLower)' -eq 'true' -or '$(ShouldRunShort)' -eq 'true') {
137-
Write-Host "Stage condition eq(..., 'true') would be TRUE"
134+
# Test which one has a clean value
135+
if ('$(ShouldRunAlias)' -eq 'true') {
136+
Write-Host "SUCCESS: Alias output eq 'true' - Stage conditions should work"
137+
} elseif ('$(ShouldRunMain)' -eq 'true') {
138+
Write-Host "SUCCESS: Main output eq 'true' - Stage conditions should work"
138139
} else {
139-
Write-Host "Stage condition eq(..., 'true') would be FALSE"
140+
Write-Host "PROBLEM: Neither output equals 'true'"
141+
Write-Host "Main: [$(ShouldRunMain)]"
142+
Write-Host "Alias: [$(ShouldRunAlias)]"
140143
}
141144
displayName: 'Echo dependency output variable'
142145
@@ -472,7 +475,7 @@ stages:
472475
condition: |
473476
and(
474477
succeeded(),
475-
eq(stageDependencies.Quality_Test_and_Unit_Test.Determine_DSC_Resource_Test_Requirements.outputs['determinedscresourcetests.rundscresit'], 'true')
478+
eq(stageDependencies.Quality_Test_and_Unit_Test.Determine_DSC_Resource_Test_Requirements.outputs['determineDscResourceTests.runDscResIT'], 'true')
476479
)
477480
jobs:
478481
- job: Test_Integration
@@ -570,7 +573,7 @@ stages:
570573
condition: |
571574
and(
572575
succeeded(),
573-
eq(stageDependencies.Quality_Test_and_Unit_Test.Determine_DSC_Resource_Test_Requirements.outputs['determinedscresourcetests.rundscresit'], 'true')
576+
eq(stageDependencies.Quality_Test_and_Unit_Test.Determine_DSC_Resource_Test_Requirements.outputs['determineDscResourceTests.runDscResIT'], 'true')
574577
)
575578
jobs:
576579
- job: Test_Integration
@@ -665,7 +668,7 @@ stages:
665668
condition: |
666669
and(
667670
succeeded(),
668-
eq(stageDependencies.Quality_Test_and_Unit_Test.Determine_DSC_Resource_Test_Requirements.outputs['determinedscresourcetests.rundscresit'], 'true')
671+
eq(stageDependencies.Quality_Test_and_Unit_Test.Determine_DSC_Resource_Test_Requirements.outputs['determineDscResourceTests.runDscResIT'], 'true')
669672
)
670673
jobs:
671674
- job: Test_Integration
@@ -741,7 +744,7 @@ stages:
741744
condition: |
742745
and(
743746
succeeded(),
744-
eq(stageDependencies.Quality_Test_and_Unit_Test.Determine_DSC_Resource_Test_Requirements.outputs['determinedscresourcetests.rundscresit'], 'true')
747+
eq(stageDependencies.Quality_Test_and_Unit_Test.Determine_DSC_Resource_Test_Requirements.outputs['determineDscResourceTests.runDscResIT'], 'true')
745748
)
746749
jobs:
747750
- job: Test_Integration
@@ -808,7 +811,7 @@ stages:
808811
condition: |
809812
and(
810813
succeeded(),
811-
eq(stageDependencies.Quality_Test_and_Unit_Test.Determine_DSC_Resource_Test_Requirements.outputs['determinedscresourcetests.rundscresit'], 'true')
814+
eq(stageDependencies.Quality_Test_and_Unit_Test.Determine_DSC_Resource_Test_Requirements.outputs['determineDscResourceTests.runDscResIT'], 'true')
812815
)
813816
jobs:
814817
- job: Test_Integration

0 commit comments

Comments
 (0)