From dda699d51a87ee3b76d6dd207fa9835ec2e7bd36 Mon Sep 17 00:00:00 2001
From: Santiago Fernandez Madero <safern@microsoft.com>
Date: Wed, 15 Jul 2020 11:01:18 -0700
Subject: [PATCH] Move wasm queue to one that has more capacity and condition
 it

---
 eng/pipelines/libraries/helix-queues-setup.yml |  2 +-
 eng/pipelines/runtime.yml                      | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/eng/pipelines/libraries/helix-queues-setup.yml b/eng/pipelines/libraries/helix-queues-setup.yml
index 6002db00b7c1e7..58d1f89fe3c08a 100644
--- a/eng/pipelines/libraries/helix-queues-setup.yml
+++ b/eng/pipelines/libraries/helix-queues-setup.yml
@@ -138,6 +138,6 @@ jobs:
 
     # WebAssembly
     - ${{ if eq(parameters.platform, 'Browser_wasm') }}:
-      - Ubuntu.2004.Amd64.Open
+      - Ubuntu.1804.Amd64.Open
 
     ${{ insert }}: ${{ parameters.jobParameters }}
diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml
index 6c10225f36ae19..7dae35b0da9b3a 100644
--- a/eng/pipelines/runtime.yml
+++ b/eng/pipelines/runtime.yml
@@ -129,11 +129,6 @@ 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
@@ -318,8 +313,8 @@ jobs:
     - Browser_wasm
     variables:
       # map dependencies variables to local variables
-      - name: testsProjContainsChange
-        value: $[ dependencies.checkout.outputs['SetPathVars_testsproj.containsChange'] ]
+      - name: librariesContainsChange
+        value: $[ dependencies.checkout.outputs['SetPathVars_libraries.containsChange'] ]
       - name: monoContainsChange
         value: $[ dependencies.checkout.outputs['SetPathVars_mono.containsChange'] ]
     jobParameters:
@@ -338,10 +333,9 @@ jobs:
       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['librariesContainsChange'], true),
           eq(variables['monoContainsChange'], true),
           eq(variables['isFullMatrix'], true))