From 04fc8bb9c1422606c0cace5401eff2274ff27ba0 Mon Sep 17 00:00:00 2001 From: Manuel de la Pena Date: Wed, 12 Apr 2023 17:20:53 -0400 Subject: [PATCH 1/2] [CI] Add some extra params to configure the test templates. --- .../stage-msbuild-emulator-tests.yaml | 13 ++++++++----- .../yaml-templates/stage-msbuild-tests.yaml | 11 +++++++---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml b/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml index 5ba84d5299b..ce9c7b669e4 100644 --- a/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml +++ b/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml @@ -1,14 +1,17 @@ # Runs MSBuild tests against a device running on macOS parameters: + stageName: msbuilddevice_tests job_name: 'mac_dotnetdevice_tests' + depensOn: mac_build agent_count: 8 stageCondition: succeeded() + stagePrefix: '' stages: -- stage: msbuilddevice_tests - displayName: MSBuild Emulator Tests - dependsOn: mac_build +- stage: ${{ parameters.stageName }} + displayName: ${{ parameters.stagePrefix }}MSBuild Emulator Tests + dependsOn: ${{ parameters.dependsOn }} condition: ${{ parameters.stageCondition }} jobs: - job: ${{ parameters.job_name }} @@ -35,12 +38,12 @@ stages: parameters: displayName: install emulator arguments: --s=EmulatorTestDependencies --android-sdk-platforms="$(DefaultTestSdkPlatforms)" - + - task: DownloadPipelineArtifact@2 inputs: artifactName: $(TestAssembliesArtifactName) downloadPath: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration) - + - template: start-stop-emulator.yaml - template: run-sliced-nunit-tests.yaml diff --git a/build-tools/automation/yaml-templates/stage-msbuild-tests.yaml b/build-tools/automation/yaml-templates/stage-msbuild-tests.yaml index 09c1d8b5f2f..0cc8ba108e8 100644 --- a/build-tools/automation/yaml-templates/stage-msbuild-tests.yaml +++ b/build-tools/automation/yaml-templates/stage-msbuild-tests.yaml @@ -1,12 +1,15 @@ # Runs MSBuild tests that do not require devices on Mac/Windows parameters: + stageName: msbuild_dotnet stageCondition: succeeded() + depensOn: mac_build + stagePrefix: '' stages: -- stage: msbuild_dotnet - displayName: MSBuild Tests - dependsOn: mac_build +- stage: ${{ parameters.stageName }} + displayName: ${{ parameters.stagePrefix }}MSBuild Tests + dependsOn: ${{ parameters.dependsOn }} condition: ${{ parameters.stageCondition }} jobs: - template: run-msbuild-tests.yaml @@ -16,7 +19,7 @@ stages: jobDisplayName: macOS > Tests > MSBuild agentCount: 10 testFilter: cat != Dummy # This is because $(ExcludedNUnitCategories) gets appended which starts with '&' - + - template: run-msbuild-tests.yaml parameters: testOS: Windows From 1ed556101079ae75e57d9025a8cdccd9ea647148 Mon Sep 17 00:00:00 2001 From: Manuel de la Pena Date: Wed, 12 Apr 2023 19:12:33 -0400 Subject: [PATCH 2/2] Fix typos. --- .../automation/yaml-templates/stage-msbuild-emulator-tests.yaml | 2 +- build-tools/automation/yaml-templates/stage-msbuild-tests.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml b/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml index ce9c7b669e4..e5c3c33e857 100644 --- a/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml +++ b/build-tools/automation/yaml-templates/stage-msbuild-emulator-tests.yaml @@ -3,7 +3,7 @@ parameters: stageName: msbuilddevice_tests job_name: 'mac_dotnetdevice_tests' - depensOn: mac_build + dependsOn: mac_build agent_count: 8 stageCondition: succeeded() stagePrefix: '' diff --git a/build-tools/automation/yaml-templates/stage-msbuild-tests.yaml b/build-tools/automation/yaml-templates/stage-msbuild-tests.yaml index 0cc8ba108e8..032984683f6 100644 --- a/build-tools/automation/yaml-templates/stage-msbuild-tests.yaml +++ b/build-tools/automation/yaml-templates/stage-msbuild-tests.yaml @@ -3,7 +3,7 @@ parameters: stageName: msbuild_dotnet stageCondition: succeeded() - depensOn: mac_build + dependsOn: mac_build stagePrefix: '' stages: