diff options
author | Santiago Fernandez Madero <safern@microsoft.com> | 2020-07-15 00:25:03 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-15 00:25:03 +0300 |
commit | 4a0bc02a1f7ca221443c37bf21a5c2c35520d8ab (patch) | |
tree | 18e4f442cb111d3693a4b297554ba8e4d53f6eda /eng/pipelines | |
parent | 21cad60642b5d6f8efb5592ce00c265cdf680218 (diff) |
WASM: run tests on CI only in rolling and/or when libraries/tests.proj is changed (#39239)
* WASM: run tests on CI only in rolling and/or when libraries/tests.proj is changed
* Fix build
* Test change in tests.proj
* Fix build
* Flow variables from platform-matrix to jobTemplate
* Fix installer base template variables propagation
* Pass variables as array
Diffstat (limited to 'eng/pipelines')
-rw-r--r-- | eng/pipelines/common/global-build-job.yml | 5 | ||||
-rw-r--r-- | eng/pipelines/common/platform-matrix.yml | 23 | ||||
-rw-r--r-- | eng/pipelines/common/xplat-setup.yml | 4 | ||||
-rw-r--r-- | eng/pipelines/libraries/helix-queues-setup.yml | 2 | ||||
-rw-r--r-- | eng/pipelines/runtime.yml | 26 |
5 files changed, 53 insertions, 7 deletions
diff --git a/eng/pipelines/common/global-build-job.yml b/eng/pipelines/common/global-build-job.yml index 8f02954c870..dcbba9fb365 100644 --- a/eng/pipelines/common/global-build-job.yml +++ b/eng/pipelines/common/global-build-job.yml @@ -7,7 +7,7 @@ parameters: osSubgroup: '' container: '' crossrootfsDir: '' - variables: {} + variables: [] timeoutInMinutes: '' pool: '' condition: true @@ -54,7 +54,8 @@ jobs: ${{ if ne(parameters.isOfficialBuild, true) }}: value: '' - - ${{ parameters.variables }} + - ${{ each variable in parameters.variables }}: + - ${{ variable }} steps: - template: /eng/pipelines/common/clone-checkout-bundle-step.yml diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index bf9c4a2fc97..b4f80202400 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -22,6 +22,7 @@ parameters: # Handled as an opt-in parameter to avoid excessive yaml. passPlatforms: false jobParameters: {} + variables: [] jobs: @@ -31,6 +32,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: Linux archType: arm platform: Linux_arm @@ -54,6 +56,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: Linux archType: arm64 platform: Linux_arm64 @@ -77,6 +80,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: Linux osSubgroup: _musl archType: x64 @@ -104,6 +108,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: Linux osSubgroup: _musl archType: arm64 @@ -128,6 +133,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: Linux archType: x64 platform: Linux_x64 @@ -150,6 +156,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: Browser archType: wasm platform: Browser_wasm @@ -170,6 +177,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: FreeBSD archType: x64 platform: FreeBSD_x64 @@ -192,6 +200,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: Android archType: x64 platform: Android_x64 @@ -214,6 +223,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: Android archType: x86 platform: Android_x86 @@ -236,6 +246,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: Android archType: arm platform: Android_arm @@ -258,6 +269,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: Android archType: arm64 platform: Android_arm64 @@ -280,6 +292,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: tvOS archType: x64 platform: tvOS_x64 @@ -299,6 +312,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: tvOS archType: arm64 platform: tvOS_arm64 @@ -318,6 +332,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: iOS archType: x64 platform: iOS_x64 @@ -337,6 +352,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: iOS archType: x86 platform: iOS_x86 @@ -357,6 +373,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: iOS archType: arm platform: iOS_arm @@ -376,6 +393,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: iOS archType: arm64 platform: iOS_arm64 @@ -395,6 +413,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: OSX archType: x64 platform: OSX_x64 @@ -414,6 +433,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: Windows_NT archType: x64 platform: Windows_NT_x64 @@ -433,6 +453,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: Windows_NT archType: x86 platform: Windows_NT_x86 @@ -451,6 +472,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: Windows_NT archType: arm platform: Windows_NT_arm @@ -470,6 +492,7 @@ jobs: parameters: jobTemplate: ${{ parameters.jobTemplate }} helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} osGroup: Windows_NT archType: arm64 platform: Windows_NT_arm64 diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index f80c77a01eb..f6a5ee11f4e 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -7,6 +7,7 @@ parameters: helixQueuesTemplate: '' platform: '' jobParameters: {} + variables: [] jobs: - template: ${{ coalesce(parameters.helixQueuesTemplate, parameters.jobTemplate) }} @@ -84,6 +85,9 @@ jobs: value: Mono ${{ if eq(parameters.jobParameters.runtimeFlavor, 'coreclr') }}: value: CoreCLR + + - ${{ each variable in parameters.variables }}: + - ${{ variable }} osGroup: ${{ parameters.osGroup }} osSubgroup: ${{ parameters.osSubgroup }} diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index 2bdfc571588..6002db00b7c 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -1,6 +1,6 @@ parameters: jobTemplate: '' - variables: {} + variables: [] osGroup: '' osSubgroup: '' archType: '' diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 10f5a74afc3..6c10225f36a 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -129,6 +129,11 @@ jobs: - eng/pipelines/coreclr/* - eng/pipelines/mono/* - eng/pipelines/libraries/* + + # Temporary workaround to: https://github.com/dotnet/runtime/issues/39238 + - subset: testsproj + include: + - src/libraries/tests.proj # # Build CoreCLR checked @@ -311,21 +316,34 @@ jobs: runtimeFlavor: mono platforms: - Browser_wasm + variables: + # map dependencies variables to local variables + - name: testsProjContainsChange + value: $[ dependencies.checkout.outputs['SetPathVars_testsproj.containsChange'] ] + - name: monoContainsChange + value: $[ dependencies.checkout.outputs['SetPathVars_mono.containsChange'] ] jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono buildArgs: -s mono+libs+installer+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true timeoutInMinutes: 120 - extraStepsTemplate: /eng/pipelines/libraries/helix.yml - extraStepsParameters: - creator: dotnet-bot - testRunNamePrefixSuffix: Mono_$(_BuildConfig) condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), eq(dependencies.checkout.outputs['SetPathVars_mono.containsChange'], true), eq(dependencies.checkout.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isFullMatrix'], true)) + # extra steps, run tests + extraStepsTemplate: /eng/pipelines/libraries/helix.yml + extraStepsParameters: + creator: dotnet-bot + testRunNamePrefixSuffix: Mono_$(_BuildConfig) + # update once: https://github.com/dotnet/runtime/issues/39238 is fixed + condition: >- + or( + eq(variables['testsProjContainsChange'], true), + eq(variables['monoContainsChange'], true), + eq(variables['isFullMatrix'], true)) # # Build Mono and Installer on LLVMJIT mode |