Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions diagnostics.yml
Original file line number Diff line number Diff line change
Expand Up @@ -272,11 +272,13 @@ extends:
artifactUploadPath: ${{ format('bin/linux.arm64.{0}', variables.validationConfiguration) }}
artifactTargetPath: ${{ format('bin/linux-musl.arm64.{0}', variables.validationConfiguration) }}

- ${{ if ne(parameters.buildOnly, true) }}:
- stage: test
displayName: Test Diagnostics
dependsOn: build
jobs:
############################
# #
# Test legs #
# #
############################

- ${{ if ne(parameters.buildOnly, true) }}:
- template: /eng/pipelines/build.yml
parameters:
jobTemplate: ${{ variables.jobTemplate }}
Expand Down Expand Up @@ -336,6 +338,7 @@ extends:
jobTemplate: ${{ variables.jobTemplate }}
name: ${{ format('SOS_Helix_Windows_x64_{0}', variables.validationConfiguration) }}
osGroup: Windows_NT
dependsOn: ${{ format('Windows_x64_{0}', variables.validationConfiguration) }}
artifactPhase: ${{ format('Windows_x64_{0}', variables.validationConfiguration) }}
configuration: ${{ variables.validationConfiguration }}
architecture: x64
Expand All @@ -348,6 +351,7 @@ extends:
jobTemplate: ${{ variables.jobTemplate }}
name: ${{ format('SOS_Helix_Windows_x86_{0}', variables.validationConfiguration) }}
osGroup: Windows_NT
dependsOn: ${{ format('Windows_x86_{0}', variables.validationConfiguration) }}
artifactPhase: ${{ format('Windows_x86_{0}', variables.validationConfiguration) }}
configuration: ${{ variables.validationConfiguration }}
architecture: x86
Expand All @@ -361,6 +365,7 @@ extends:
name: ${{ format('SOS_Helix_Linux_x64_{0}', variables.validationConfiguration) }}
osGroup: Linux
container: test_ubuntu_22_04
dependsOn: ${{ format('Linux_x64_{0}', variables.validationConfiguration) }}
artifactPhase: ${{ format('Linux_x64_{0}', variables.validationConfiguration) }}
configuration: ${{ variables.validationConfiguration }}
architecture: x64
Expand All @@ -374,6 +379,7 @@ extends:
name: ${{ format('SOS_Helix_Linux_arm64_{0}', variables.validationConfiguration) }}
osGroup: Linux
container: test_ubuntu_22_04
dependsOn: ${{ format('Linux_arm64_{0}', variables.validationConfiguration) }}
artifactPhase: ${{ format('Linux_arm64_{0}', variables.validationConfiguration) }}
configuration: ${{ variables.validationConfiguration }}
architecture: arm64
Expand All @@ -387,6 +393,7 @@ extends:
name: ${{ format('SOS_Helix_Alpine_x64_{0}', variables.validationConfiguration) }}
osGroup: Linux
container: test_linux_musl_x64
dependsOn: ${{ format('Linux_musl_x64_{0}', variables.validationConfiguration) }}
artifactPhase: ${{ format('Linux_musl_x64_{0}', variables.validationConfiguration) }}
configuration: ${{ variables.validationConfiguration }}
architecture: x64
Expand All @@ -400,6 +407,7 @@ extends:
jobTemplate: ${{ variables.jobTemplate }}
name: ${{ format('SOS_Helix_MacOS_arm64_{0}', variables.validationConfiguration) }}
osGroup: MacOS
dependsOn: ${{ format('MacOS_arm64_{0}', variables.validationConfiguration) }}
artifactPhase: ${{ format('MacOS_arm64_{0}', variables.validationConfiguration) }}
configuration: ${{ variables.validationConfiguration }}
architecture: arm64
Expand All @@ -413,6 +421,7 @@ extends:
jobTemplate: ${{ variables.jobTemplate }}
name: SOS_Helix_Windows_x64_Debug
osGroup: Windows_NT
dependsOn: Windows_x64_Debug
artifactPhase: Windows_x64_Debug
configuration: Debug
architecture: x64
Expand All @@ -425,6 +434,7 @@ extends:
jobTemplate: ${{ variables.jobTemplate }}
name: SOS_Helix_Windows_x86_Debug
osGroup: Windows_NT
dependsOn: Windows_x86_Debug
artifactPhase: Windows_x86_Debug
configuration: Debug
architecture: x86
Expand All @@ -438,6 +448,7 @@ extends:
name: SOS_Helix_Linux_x64_Debug
osGroup: Linux
container: test_ubuntu_22_04
dependsOn: Linux_x64_Debug
artifactPhase: Linux_x64_Debug
configuration: Debug
architecture: x64
Expand All @@ -451,6 +462,7 @@ extends:
name: SOS_Helix_Linux_arm64_Debug
osGroup: Linux
container: test_ubuntu_22_04
dependsOn: Linux_arm64_Debug
artifactPhase: Linux_arm64_Debug
configuration: Debug
architecture: arm64
Expand All @@ -464,6 +476,7 @@ extends:
name: SOS_Helix_Alpine_x64_Debug
osGroup: Linux
container: test_linux_musl_x64
dependsOn: Linux_musl_x64_Debug
artifactPhase: Linux_musl_x64_Debug
configuration: Debug
architecture: x64
Expand All @@ -477,6 +490,7 @@ extends:
jobTemplate: ${{ variables.jobTemplate }}
name: SOS_Helix_MacOS_arm64_Debug
osGroup: MacOS
dependsOn: MacOS_arm64_Debug
artifactPhase: MacOS_arm64_Debug
configuration: Debug
architecture: arm64
Expand All @@ -489,6 +503,7 @@ extends:
jobTemplate: ${{ variables.jobTemplate }}
name: SOS_Helix_MacOS_x64_Debug
osGroup: MacOS
dependsOn: MacOS_x64_Debug
artifactPhase: MacOS_x64_Debug
configuration: Debug
architecture: x64
Expand All @@ -501,6 +516,7 @@ extends:
jobTemplate: ${{ variables.jobTemplate }}
name: SOS_Helix_MacOS_x64_Release
osGroup: MacOS
dependsOn: MacOS_x64_Release
artifactPhase: MacOS_x64_Release
configuration: Release
architecture: x64
Expand Down
5 changes: 2 additions & 3 deletions eng/pipelines/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,7 @@ jobs:
${{ if ne(parameters.strategy, '') }}:
'error, we can no longer support the strategy feature in the new pipeline system. Please remove the strategy from the job template.': error

# Test-only jobs run in the test stage, whose dependency on the build stage
# makes the matching artifacts available before any test job starts.
${{ if and(ne(parameters.dependsOn, ''), ne(parameters.testOnly, true)) }}:
${{ if ne(parameters.dependsOn, '') }}:
dependsOn: ${{ parameters.dependsOn }}_${{ config.architecture }}_${{ config.configuration }}

workspace:
Expand Down Expand Up @@ -202,6 +200,7 @@ jobs:
/p:OfficialBuildId=$(BUILD.BUILDNUMBER)
${{ if eq(parameters.testOnly, 'true') }}:
displayName: Test
continueOnError: ${{ eq(variables.isOfficialBuild, 'true') }}
${{ elseif eq(parameters.buildOnly, 'true') }}:
displayName: Build
${{ else }}:
Expand Down
2 changes: 2 additions & 0 deletions eng/pipelines/sos-helix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ jobs:
Creator: dotnet-bot
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
condition: eq(variables['Agent.Os'], 'Windows_NT')
continueOnError: ${{ eq(variables.isOfficialBuild, 'true') }}

- script: >
$BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh
Expand All @@ -104,6 +105,7 @@ jobs:
Creator: dotnet-bot
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
condition: ne(variables['Agent.Os'], 'Windows_NT')
continueOnError: ${{ eq(variables.isOfficialBuild, 'true') }}

- task: CopyFiles@2
displayName: Gather Helix logs
Expand Down
Loading