From ac16289157c00aa7a8b4c348bdb0d4ddb9b5bfd0 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Sat, 10 Sep 2022 13:55:50 -0500 Subject: [PATCH 1/9] Bump the NoTargets version --- src/tests/Common/wasm-test-runner/WasmTestRunner.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/Common/wasm-test-runner/WasmTestRunner.proj b/src/tests/Common/wasm-test-runner/WasmTestRunner.proj index 3c604b39a4a850..420f009b00be6b 100644 --- a/src/tests/Common/wasm-test-runner/WasmTestRunner.proj +++ b/src/tests/Common/wasm-test-runner/WasmTestRunner.proj @@ -1,6 +1,6 @@ - + false From 4d0dfc9e4561ecc7340f2146273aec92bba87a2b Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Sat, 10 Sep 2022 15:33:10 -0400 Subject: [PATCH 2/9] Update src/tests/Common/wasm-test-runner/WasmTestRunner.proj --- src/tests/Common/wasm-test-runner/WasmTestRunner.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/Common/wasm-test-runner/WasmTestRunner.proj b/src/tests/Common/wasm-test-runner/WasmTestRunner.proj index 420f009b00be6b..ee8284b5b1c331 100644 --- a/src/tests/Common/wasm-test-runner/WasmTestRunner.proj +++ b/src/tests/Common/wasm-test-runner/WasmTestRunner.proj @@ -1,6 +1,6 @@ - + false From 27e7f30bb502ddd77f8392b253308932bef74a11 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Sat, 10 Sep 2022 15:37:29 -0400 Subject: [PATCH 3/9] Update src/tests/Common/wasm-test-runner/WasmTestRunner.proj --- src/tests/Common/wasm-test-runner/WasmTestRunner.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/Common/wasm-test-runner/WasmTestRunner.proj b/src/tests/Common/wasm-test-runner/WasmTestRunner.proj index ee8284b5b1c331..a692df6a293002 100644 --- a/src/tests/Common/wasm-test-runner/WasmTestRunner.proj +++ b/src/tests/Common/wasm-test-runner/WasmTestRunner.proj @@ -1,6 +1,6 @@ - + false From 2aee76143f0ff74d0604ed13ab99d756e2fcbb08 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Sat, 10 Sep 2022 16:20:18 -0400 Subject: [PATCH 4/9] evaluate-default-paths: add wasm-test-runner to wasm_specific_only subset, so it doesn't trigger non-wasm jobs --- eng/pipelines/common/evaluate-default-paths.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index b5954295451a52..54480c50a01169 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -17,6 +17,7 @@ parameters: src/tasks/WasmAppBuilder/* src/tasks/WasmBuildTasks/* src/tasks/WorkloadBuildTasks/* + src/tests/Common/wasm-test-runner/* ] jobs: From 3d1fe6db528c8a8c7c23287fc178ae7923fa349e Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Sat, 10 Sep 2022 16:51:17 -0400 Subject: [PATCH 5/9] CI: update triggers - wasm library tests, and build-only should be triggered by wasm changes only if there are non-runtime-tests changes, be runtimetest only changes already trigger the corresponding job --- eng/pipelines/common/evaluate-default-paths.yml | 17 +++++++++++++++++ .../common/templates/wasm-build-only.yml | 4 +++- .../common/templates/wasm-library-tests.yml | 4 +++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index 54480c50a01169..343cdf2687c1a7 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -93,6 +93,15 @@ jobs: - subset: runtimetests include: - src/tests/* + + - subset: non_runtimetests + exclude: + - src/tests/* + + # having this ensures that change in evaluate-default-paths.yml + # doesn't trigger jobs + - eng/pipelines/common/evaluate-default-paths.yml + - subset: installer include: - docs/manpages/* @@ -176,6 +185,10 @@ jobs: - src/mono/wasm/Wasm.Build.Tests/* - src/mono/wasm/debugger/* + # having this ensures that change in evaluate-default-paths.yml + # doesn't trigger jobs + - eng/pipelines/common/evaluate-default-paths.yml + - subset: wasm_wbt_or_dbg include: - src/mono/wasm/Wasm.Build.Tests/* @@ -232,5 +245,9 @@ jobs: - src/tasks/WasmBuildTasks/* - src/tasks/WorkloadBuildTasks/* + # having this ensures that change in evaluate-default-paths.yml + # doesn't trigger jobs + - eng/pipelines/common/evaluate-default-paths.yml + - ${{ if ne(parameters.extraSubsets, '') }}: - ${{ parameters.extraSubsets }} diff --git a/eng/pipelines/common/templates/wasm-build-only.yml b/eng/pipelines/common/templates/wasm-build-only.yml index d9e87dc241232c..b25cf85c88c0b8 100644 --- a/eng/pipelines/common/templates/wasm-build-only.yml +++ b/eng/pipelines/common/templates/wasm-build-only.yml @@ -26,7 +26,9 @@ jobs: or( eq(variables['wasmDarcDependenciesChanged'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true), + and( + eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_runtimetests.containsChange'], true)), eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm_libraries.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true)) ] diff --git a/eng/pipelines/common/templates/wasm-library-tests.yml b/eng/pipelines/common/templates/wasm-library-tests.yml index 04142455e1a28c..dd6453dbd5326a 100644 --- a/eng/pipelines/common/templates/wasm-library-tests.yml +++ b/eng/pipelines/common/templates/wasm-library-tests.yml @@ -38,7 +38,9 @@ jobs: eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true)))) + and( + eq(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_non_runtimetests.containsChange'], true))))) ] - name: onlyWBTOrDbgTestHaveChanges value: From 90e7650d0925cef18adeb3a8b1e6d24a10bf8dba Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Sat, 10 Sep 2022 17:14:54 -0400 Subject: [PATCH 6/9] CI: don't trigger non-wasm jobs based on wasm pipeline changes --- eng/pipelines/common/evaluate-default-paths.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml index 343cdf2687c1a7..5ce7b7a1f346e1 100644 --- a/eng/pipelines/common/evaluate-default-paths.yml +++ b/eng/pipelines/common/evaluate-default-paths.yml @@ -19,6 +19,12 @@ parameters: src/tasks/WorkloadBuildTasks/* src/tests/Common/wasm-test-runner/* ] + _wasm_pipelines: [ + eng/pipelines/*wasm* + eng/pipelines/common/templates/*wasm* + eng/pipelines/common/templates/runtime/wasm* + eng/pipelines/coreclr/*wasm* + ] jobs: - template: /eng/pipelines/common/evaluate-paths-job.yml @@ -46,6 +52,7 @@ jobs: - eng/pipelines/mono/* - eng/pipelines/libraries/* - eng/pipelines/common/evaluate-default-paths.yml + - ${{ parameters._const_paths._wasm_pipelines }} - subset: mono_excluding_wasm include: @@ -55,6 +62,7 @@ jobs: - src/native/libs/System.IO.Compression.Native/* exclude: - ${{ parameters._const_paths._wasm_specific_only }} + - ${{ parameters._const_paths._wasm_pipelines }} - eng/Version.Details.xml - '*.md' @@ -89,6 +97,7 @@ jobs: - eng/pipelines/mono/* - eng/pipelines/installer/* - eng/pipelines/common/evaluate-default-paths.yml + - ${{ parameters._const_paths._wasm_pipelines }} - subset: runtimetests include: @@ -97,6 +106,7 @@ jobs: - subset: non_runtimetests exclude: - src/tests/* + - ${{ parameters._const_paths._wasm_pipelines }} # having this ensures that change in evaluate-default-paths.yml # doesn't trigger jobs @@ -121,6 +131,7 @@ jobs: - eng/pipelines/mono/* - eng/pipelines/libraries/* - eng/pipelines/common/evaluate-default-paths.yml + - ${{ parameters._const_paths._wasm_pipelines }} # We have limited Apple Silicon testing capacity # We want PR testing on a narrower set of changes @@ -184,6 +195,7 @@ jobs: exclude: - src/mono/wasm/Wasm.Build.Tests/* - src/mono/wasm/debugger/* + - ${{ parameters._const_paths._wasm_pipelines }} # having this ensures that change in evaluate-default-paths.yml # doesn't trigger jobs @@ -225,6 +237,7 @@ jobs: - subset: non_wasm exclude: - ${{ parameters._const_paths._wasm_specific_only }} + - ${{ parameters._const_paths._wasm_pipelines }} # having this ensures that change in evaluate-default-paths.yml won't # trigger non-onlywasm jobs @@ -234,6 +247,7 @@ jobs: - subset: non_mono_and_wasm exclude: - ${{ parameters._const_paths._wasm_specific_only }} + - ${{ parameters._const_paths._wasm_pipelines }} - eng/testing/tests.mobile.targets - src/mono/* From 17e5c4c0ad1fa08900d6e1c1afede974909aed33 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Sat, 10 Sep 2022 17:44:13 -0400 Subject: [PATCH 7/9] CI: don't trigger coreclr, or mono jobs based on only wasm-runtime tests changes --- eng/pipelines/common/variables.yml | 5 +++ .../runtime-extra-platforms-other.yml | 14 ++++---- eng/pipelines/runtime-llvm.yml | 6 ++-- eng/pipelines/runtime-staging.yml | 2 +- eng/pipelines/runtime.yml | 32 +++++++++---------- 5 files changed, 32 insertions(+), 27 deletions(-) diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml index 0798b9fcd2e589..76844ed1cff9fe 100644 --- a/eng/pipelines/common/variables.yml +++ b/eng/pipelines/common/variables.yml @@ -41,4 +41,9 @@ variables: ne(variables['isExtraPlatformsBuild'], true), eq(variables['isRollingBuild'], true))) ] +- name: nonWasmRuntimeTestsContainsChange + value: $[ and( + eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + ne(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true)) ] + - template: /eng/pipelines/common/perf-variables.yml diff --git a/eng/pipelines/runtime-extra-platforms-other.yml b/eng/pipelines/runtime-extra-platforms-other.yml index 95fe8858ba2ba5..1c74613336f3a4 100644 --- a/eng/pipelines/runtime-extra-platforms-other.yml +++ b/eng/pipelines/runtime-extra-platforms-other.yml @@ -469,7 +469,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -488,7 +488,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(variables['isRollingBuild'], true)) # @@ -521,7 +521,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(variables['isRollingBuild'], true)) # extra steps, run tests extraStepsTemplate: /eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml @@ -559,7 +559,7 @@ jobs: runtimeVariant: monointerpreter condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # extra steps, run tests @@ -597,7 +597,7 @@ jobs: timeoutInMinutes: 240 condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # don't run tests on PRs until we can get significantly more devices @@ -629,7 +629,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(variables['isRollingBuild'], true)) # @@ -652,5 +652,5 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(variables['isRollingBuild'], true)) diff --git a/eng/pipelines/runtime-llvm.yml b/eng/pipelines/runtime-llvm.yml index 9f58d2bab8f605..9a501deaf1a59e 100644 --- a/eng/pipelines/runtime-llvm.yml +++ b/eng/pipelines/runtime-llvm.yml @@ -159,7 +159,7 @@ jobs: runtimeVariant: llvmaot condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -186,7 +186,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(variables['isRollingBuild'], true)) # @@ -211,5 +211,5 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(variables['isRollingBuild'], true)) diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml index 9aa56c919a7cdb..92835cb934066f 100644 --- a/eng/pipelines/runtime-staging.yml +++ b/eng/pipelines/runtime-staging.yml @@ -87,7 +87,7 @@ jobs: timeoutInMinutes: 240 condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) ${{ if eq(variables['isRollingBuild'], true) }}: diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index a32b0155816d12..a6a5c0127d51b0 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -94,7 +94,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(variables['isRollingBuild'], true)) # @@ -117,7 +117,7 @@ jobs: eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(variables['isRollingBuild'], true)) # @@ -136,7 +136,7 @@ jobs: or( eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(variables['isRollingBuild'], true)) # @@ -210,7 +210,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(variables['isFullMatrix'], true)) # @@ -232,7 +232,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(variables['isFullMatrix'], true)) # @@ -256,7 +256,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(variables['isFullMatrix'], true)) # @@ -750,7 +750,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -770,7 +770,7 @@ jobs: runtimeVariant: llvmaot condition: >- or( - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -938,7 +938,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(variables['isRollingBuild'], true)) # @@ -961,7 +961,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(variables['isRollingBuild'], true)) - template: /eng/pipelines/common/platform-matrix.yml @@ -981,7 +981,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(variables['isRollingBuild'], true)) - template: /eng/pipelines/common/platform-matrix.yml @@ -1015,7 +1015,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(variables['isRollingBuild'], true)) # @@ -1039,7 +1039,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(variables['isRollingBuild'], true)) # @@ -1062,7 +1062,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(variables['isRollingBuild'], true)) # # Mono CoreCLR runtime Test executions using live libraries and LLVM AOT @@ -1087,7 +1087,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(variables['isRollingBuild'], true)) # @@ -1112,7 +1112,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + eq($(nonWasmRuntimeTestsContainsChange), true), eq(variables['isRollingBuild'], true)) # From dc54816beeb34f44b9ca8f7afdda2503aa9a3cd3 Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Sat, 10 Sep 2022 17:49:54 -0400 Subject: [PATCH 8/9] fix --- eng/pipelines/common/variables.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/pipelines/common/variables.yml b/eng/pipelines/common/variables.yml index 76844ed1cff9fe..6b56959d527783 100644 --- a/eng/pipelines/common/variables.yml +++ b/eng/pipelines/common/variables.yml @@ -42,8 +42,9 @@ variables: eq(variables['isRollingBuild'], true))) ] - name: nonWasmRuntimeTestsContainsChange - value: $[ and( - eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), - ne(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true)) ] + value: + and( + eq(dependencies.evaluate_paths.outputs['SetPathVars_runtimetests.containsChange'], true), + ne(dependencies.evaluate_paths.outputs['SetPathVars_wasm.containsChange'], true)) - template: /eng/pipelines/common/perf-variables.yml From f2392d77df19c6f32aeb2096e5f43e36a091beac Mon Sep 17 00:00:00 2001 From: Ankit Jain Date: Sat, 10 Sep 2022 17:55:46 -0400 Subject: [PATCH 9/9] fix yml . --- .../runtime-extra-platforms-other.yml | 14 ++++---- eng/pipelines/runtime-llvm.yml | 6 ++-- eng/pipelines/runtime-staging.yml | 2 +- eng/pipelines/runtime.yml | 32 +++++++++---------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/pipelines/runtime-extra-platforms-other.yml b/eng/pipelines/runtime-extra-platforms-other.yml index 1c74613336f3a4..c3618a92f081f9 100644 --- a/eng/pipelines/runtime-extra-platforms-other.yml +++ b/eng/pipelines/runtime-extra-platforms-other.yml @@ -469,7 +469,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -488,7 +488,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -521,7 +521,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(variables['isRollingBuild'], true)) # extra steps, run tests extraStepsTemplate: /eng/pipelines/common/templates/runtimes/android-runtime-and-send-to-helix.yml @@ -559,7 +559,7 @@ jobs: runtimeVariant: monointerpreter condition: >- or( - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # extra steps, run tests @@ -597,7 +597,7 @@ jobs: timeoutInMinutes: 240 condition: >- or( - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) # don't run tests on PRs until we can get significantly more devices @@ -629,7 +629,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -652,5 +652,5 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(variables['isRollingBuild'], true)) diff --git a/eng/pipelines/runtime-llvm.yml b/eng/pipelines/runtime-llvm.yml index 9a501deaf1a59e..3033f05681e607 100644 --- a/eng/pipelines/runtime-llvm.yml +++ b/eng/pipelines/runtime-llvm.yml @@ -159,7 +159,7 @@ jobs: runtimeVariant: llvmaot condition: >- or( - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -186,7 +186,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -211,5 +211,5 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(variables['isRollingBuild'], true)) diff --git a/eng/pipelines/runtime-staging.yml b/eng/pipelines/runtime-staging.yml index 92835cb934066f..bdf8e8c9ad10ba 100644 --- a/eng/pipelines/runtime-staging.yml +++ b/eng/pipelines/runtime-staging.yml @@ -87,7 +87,7 @@ jobs: timeoutInMinutes: 240 condition: >- or( - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) ${{ if eq(variables['isRollingBuild'], true) }}: diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index a6a5c0127d51b0..075e4abd4b5fbc 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -94,7 +94,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -117,7 +117,7 @@ jobs: eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -136,7 +136,7 @@ jobs: or( eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -210,7 +210,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -232,7 +232,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -256,7 +256,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(variables['isFullMatrix'], true)) # @@ -750,7 +750,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -770,7 +770,7 @@ jobs: runtimeVariant: llvmaot condition: >- or( - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), eq(variables['isRollingBuild'], true)) @@ -938,7 +938,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -961,7 +961,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(variables['isRollingBuild'], true)) - template: /eng/pipelines/common/platform-matrix.yml @@ -981,7 +981,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(variables['isRollingBuild'], true)) - template: /eng/pipelines/common/platform-matrix.yml @@ -1015,7 +1015,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -1039,7 +1039,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -1062,7 +1062,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(variables['isRollingBuild'], true)) # # Mono CoreCLR runtime Test executions using live libraries and LLVM AOT @@ -1087,7 +1087,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(variables['isRollingBuild'], true)) # @@ -1112,7 +1112,7 @@ jobs: condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_mono_excluding_wasm.containsChange'], true), - eq($(nonWasmRuntimeTestsContainsChange), true), + eq(variables['nonWasmRuntimeTestsContainsChange'], true), eq(variables['isRollingBuild'], true)) #