From 17c319bc998ca858bb6f89707fbd338eb726a16a Mon Sep 17 00:00:00 2001
From: Michelle McDaniel <adiaaida@gmail.com>
Date: Fri, 21 Sep 2018 09:48:31 -0700
Subject: [PATCH] Move smoketests to new helix queue (dotnet/coreclr#20090)

Commit migrated from https://github.com/dotnet/coreclr/commit/deb192495ca8e9f7b02786ffe31067b8fbcfd32e
---
 src/coreclr/perf.groovy | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/coreclr/perf.groovy b/src/coreclr/perf.groovy
index 906d489..ac194ac 100644
--- a/src/coreclr/perf.groovy
+++ b/src/coreclr/perf.groovy
@@ -39,7 +39,13 @@ def static getOSGroup(def os) {
 
                         def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) {
                             // Set the label.
-                            label('windows_server_2016_clr_perf')
+                            if (isSmoketest) {
+                                label('Windows.Amd64.ClientRS4.DevEx.15.8.Perf')
+                            }
+                            else {
+                                label('windows_server_2016_clr_perf')
+                            }
+
                             wrappers {
                                 credentialsBinding {
                                     string('BV_UPLOAD_SAS_TOKEN', 'CoreCLR Perf BenchView Sas')
@@ -102,9 +108,6 @@ def static getOSGroup(def os) {
                             }
                         }
 
-                        if (isSmoketest) {
-                            Utilities.setMachineAffinity(newJob, "Windows_NT", '20170427-elevated')
-                        }
                         def archiveSettings = new ArchivalSettings()
                         archiveSettings.addFiles('bin/sandbox_logs/**/*_log.txt')
                         archiveSettings.addFiles('bin/sandbox_logs/**/*.csv')
-- 
2.7.4