From d94a04d9adc63d97971a444ca2008b7feef892a1 Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Wed, 12 Feb 2025 21:05:38 +0100 Subject: [PATCH 1/3] Remove coreclr android job from extra-platforms --- ...untime-extra-platforms-androidemulator.yml | 32 ------------------- eng/pipelines/runtime.yml | 2 +- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml b/eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml index 3b4e79cf9151c6..4badaf93186c0b 100644 --- a/eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml +++ b/eng/pipelines/extra-platforms/runtime-extra-platforms-androidemulator.yml @@ -118,35 +118,3 @@ jobs: parameters: creator: dotnet-bot testRunNamePrefixSuffix: Mono_$(_BuildConfig) - -# -# Android emulators -# Build the whole product using CoreCLR 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: coreclr - platforms: - - android_x64 - - android_arm64 - variables: - # map dependencies variables to local variables - - name: librariesContainsChange - value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'] ] - - name: coreclrContainsChange - value: $[ stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'] ] - jobParameters: - testGroup: innerloop - nameSuffix: AllSubsets_CoreCLR - isExtraPlatforms: ${{ parameters.isExtraPlatformsBuild }} - buildArgs: -s clr.runtime+clr.alljits+clr.corelib+clr.nativecorelib+clr.tools+clr.packages+libs+libs.tests+host+packs -c $(_BuildConfig) /p:ArchiveTests=true /p:TestAssemblies=false - timeoutInMinutes: 180 - # extra steps, run tests - postBuildSteps: - - template: /eng/pipelines/libraries/helix.yml - parameters: - creator: dotnet-bot - testRunNamePrefixSuffix: CoreCLR_$(_BuildConfig) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index b90fed4e330c91..06a48f27fc3f68 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -964,7 +964,7 @@ extends: eq(variables['isRollingBuild'], true)) # - # Android devices + # Android arm64 devices and x64 emulators # Build the whole product using CoreCLR and run libraries tests # - template: /eng/pipelines/common/platform-matrix.yml From 8a9cd49c966e0155e73412e710fdd6563ada1e0b Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Thu, 13 Feb 2025 09:30:09 +0100 Subject: [PATCH 2/3] Update eng/pipelines/runtime.yml Co-authored-by: Matous Kozak <55735845+matouskozak@users.noreply.github.com> --- eng/pipelines/runtime.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 06a48f27fc3f68..2e709e20e25a1b 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -965,7 +965,7 @@ extends: # # Android arm64 devices and x64 emulators - # Build the whole product using CoreCLR and run libraries tests + # Build the whole product using CoreCLR and run functional tests # - template: /eng/pipelines/common/platform-matrix.yml parameters: From 68ce3f4007c751cb712aa18832d76d153705280b Mon Sep 17 00:00:00 2001 From: Milos Kotlar Date: Thu, 13 Feb 2025 09:33:05 +0100 Subject: [PATCH 3/3] Add SetPathVars_coreclr condition --- eng/pipelines/runtime.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 2e709e20e25a1b..4880c8475743da 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -990,6 +990,7 @@ extends: condition: >- or( eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_libraries.containsChange'], true), + eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_coreclr.containsChange'], true), eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_installer.containsChange'], true), eq(variables['isRollingBuild'], true)) # extra steps, run tests