From 87c57ac380149b14ce4115fb96f102dec1d839c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Wed, 26 Jan 2022 20:26:32 +0100 Subject: [PATCH 1/5] Disable smoke tests and Android x86 --- eng/pipelines/runtime-extra-platforms-other.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/runtime-extra-platforms-other.yml b/eng/pipelines/runtime-extra-platforms-other.yml index 51aa5934ebb400..50ff88c77fda87 100644 --- a/eng/pipelines/runtime-extra-platforms-other.yml +++ b/eng/pipelines/runtime-extra-platforms-other.yml @@ -320,7 +320,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono - buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true $(_runSmokeTestsOnlyArg) + buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true # $(_runSmokeTestsOnlyArg) timeoutInMinutes: 180 condition: >- or( From 4a3886f7e2eb3f4f6f6b6b5c9972f1eaff19c634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Thu, 27 Jan 2022 16:16:46 +0100 Subject: [PATCH 2/5] Run on Android 21 to 32 --- .../coreclr/templates/helix-queues-setup.yml | 14 ++++- .../libraries/helix-queues-setup.yml | 12 ++++ .../runtime-extra-platforms-other.yml | 2 +- eng/pipelines/runtime-extra-platforms.yml | 58 ++++++++++++++++--- 4 files changed, 76 insertions(+), 10 deletions(-) diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index 43b78cee145dc9..b1870473448f1a 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -34,8 +34,20 @@ jobs: - Windows.10.Amd64.Android.Open # Android x64 - - ${{ if in(parameters.platform, 'Android_x64') }}: + - ${{ if in(parameters.platform, 'Android_x86', 'Android_x64') }}: + - Ubuntu.1804.Amd64.Android.21.Open + - Ubuntu.1804.Amd64.Android.22.Open + - Ubuntu.1804.Amd64.Android.23.Open + - Ubuntu.1804.Amd64.Android.24.Open + - Ubuntu.1804.Amd64.Android.25.Open + - Ubuntu.1804.Amd64.Android.26.Open + - Ubuntu.1804.Amd64.Android.27.Open + - Ubuntu.1804.Amd64.Android.28.Open - Ubuntu.1804.Amd64.Android.29.Open + - Ubuntu.1804.Amd64.Android.30.Open + - ${{ if in(parameters.platform, 'Android_x64') }}: # there's no x86 emulator image anymore since Android 31 + - Ubuntu.1804.Amd64.Android.31.Open + - Ubuntu.1804.Amd64.Android.32.Open # Browser wasm - ${{ if eq(parameters.platform, 'Browser_wasm') }}: diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml index ecca458ba59323..9a0346eb5656de 100644 --- a/eng/pipelines/libraries/helix-queues-setup.yml +++ b/eng/pipelines/libraries/helix-queues-setup.yml @@ -97,7 +97,19 @@ jobs: # Android - ${{ if in(parameters.platform, 'Android_x86', 'Android_x64') }}: + - Ubuntu.1804.Amd64.Android.21.Open + - Ubuntu.1804.Amd64.Android.22.Open + - Ubuntu.1804.Amd64.Android.23.Open + - Ubuntu.1804.Amd64.Android.24.Open + - Ubuntu.1804.Amd64.Android.25.Open + - Ubuntu.1804.Amd64.Android.26.Open + - Ubuntu.1804.Amd64.Android.27.Open + - Ubuntu.1804.Amd64.Android.28.Open - Ubuntu.1804.Amd64.Android.29.Open + - Ubuntu.1804.Amd64.Android.30.Open + - ${{ if in(parameters.platform, 'Android_x64') }}: # there's no x86 emulator image anymore since Android 31 + - Ubuntu.1804.Amd64.Android.31.Open + - Ubuntu.1804.Amd64.Android.32.Open - ${{ if in(parameters.platform, 'Android_arm', 'Android_arm64') }}: - Windows.10.Amd64.Android.Open diff --git a/eng/pipelines/runtime-extra-platforms-other.yml b/eng/pipelines/runtime-extra-platforms-other.yml index 50ff88c77fda87..51aa5934ebb400 100644 --- a/eng/pipelines/runtime-extra-platforms-other.yml +++ b/eng/pipelines/runtime-extra-platforms-other.yml @@ -320,7 +320,7 @@ jobs: jobParameters: testGroup: innerloop nameSuffix: AllSubsets_Mono - buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true # $(_runSmokeTestsOnlyArg) + buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true $(_runSmokeTestsOnlyArg) timeoutInMinutes: 180 condition: >- or( diff --git a/eng/pipelines/runtime-extra-platforms.yml b/eng/pipelines/runtime-extra-platforms.yml index 02591d91b6b0e3..12409654b2b997 100644 --- a/eng/pipelines/runtime-extra-platforms.yml +++ b/eng/pipelines/runtime-extra-platforms.yml @@ -35,13 +35,55 @@ jobs: - template: /eng/pipelines/common/evaluate-default-paths.yml # include this unconditionally, because it has per job conditions -- template: /eng/pipelines/runtime-extra-platforms-wasm.yml - parameters: - isWasmOnlyBuild: ${{ variables.isWasmOnlyBuild }} - isRollingBuild: ${{ variables.isRollingBuild }} +#- template: /eng/pipelines/runtime-extra-platforms-wasm.yml +# parameters: +# isWasmOnlyBuild: ${{ variables.isWasmOnlyBuild }} +# isRollingBuild: ${{ variables.isRollingBuild }} # Any jobs that are not specific to any platform -- ${{ if eq(variables.isNotSpecificPlatformOnlyBuild, true) }}: - - template: /eng/pipelines/runtime-extra-platforms-other.yml - parameters: - isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }} +#- ${{ if eq(variables.isNotSpecificPlatformOnlyBuild, true) }}: +# - template: /eng/pipelines/runtime-extra-platforms-other.yml +# parameters: +# isExtraPlatformsBuild: ${{ variables.isExtraPlatformsBuild }} + +# +# Android emulators +# Build the whole product using Mono and run libraries tests +# + +- template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/common/global-build-job.yml + helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml + buildConfig: Release + runtimeFlavor: mono + platforms: + - Android_x86 + - Android_x64 + variables: + # map dependencies variables to local variables + - name: librariesContainsChange + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] + - name: monoContainsChange + value: $[ dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'] ] + jobParameters: + testGroup: innerloop + nameSuffix: AllSubsets_Mono + buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true # $(_runSmokeTestsOnlyArg) + timeoutInMinutes: 180 + condition: >- + or( + eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_mono.containsChange'], true), + eq(dependencies.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), + eq(variables['isRollingBuild'], true)) + # extra steps, run tests + extraStepsTemplate: /eng/pipelines/libraries/helix.yml + extraStepsParameters: + creator: dotnet-bot + testRunNamePrefixSuffix: Mono_$(_BuildConfig) + condition: >- + or( + eq(variables['librariesContainsChange'], true), + eq(variables['monoContainsChange'], true), + eq(variables['isRollingBuild'], true)) \ No newline at end of file From ad29cdc71985ee0b96c1525f9d74f0f5239f91a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Wed, 20 Apr 2022 19:32:18 +0200 Subject: [PATCH 3/5] Bump timeout --- eng/pipelines/runtime-extra-platforms.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/runtime-extra-platforms.yml b/eng/pipelines/runtime-extra-platforms.yml index 12409654b2b997..f0baabe9b243a8 100644 --- a/eng/pipelines/runtime-extra-platforms.yml +++ b/eng/pipelines/runtime-extra-platforms.yml @@ -70,7 +70,7 @@ jobs: testGroup: innerloop nameSuffix: AllSubsets_Mono buildArgs: -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true # $(_runSmokeTestsOnlyArg) - timeoutInMinutes: 180 + timeoutInMinutes: 1800 condition: >- or( eq(dependencies.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), From 0b08cd3db8c1eae3af98c45d8d50313b25640702 Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Wed, 27 Apr 2022 10:52:29 +0200 Subject: [PATCH 4/5] Force staging Helix for Android emulator queues --- src/libraries/sendtohelixhelp.proj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index 5b4e1d4831f1ac..a008d3a0cd921b 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -74,6 +74,9 @@ true true + + + https://helix.int-dot.net From d7961c991a128e112a4dc882386abd585b59021b Mon Sep 17 00:00:00 2001 From: Premek Vysoky Date: Thu, 28 Apr 2022 11:00:13 +0200 Subject: [PATCH 5/5] Revert "Force staging Helix for Android emulator queues" This reverts commit 0b08cd3db8c1eae3af98c45d8d50313b25640702. # Conflicts: # src/libraries/sendtohelixhelp.proj --- src/libraries/sendtohelixhelp.proj | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/libraries/sendtohelixhelp.proj b/src/libraries/sendtohelixhelp.proj index c8172ac3d318cd..306aa0fc13881d 100644 --- a/src/libraries/sendtohelixhelp.proj +++ b/src/libraries/sendtohelixhelp.proj @@ -75,9 +75,6 @@ true false - - - https://helix.int-dot.net