Revert "Move smoketests to use Helix queue (dotnet#20017)" (dotnet#20058

) This reverts commit d529163.
mikedn · Sep 20, 2018 · a72d196 · a72d196
1 parent 3d2e9cc
commit a72d196
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/perf.groovy b/perf.groovy
@@ -39,12 +39,7 @@ def static getOSGroup(def os) {
 
                         def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) {
                             // Set the label.
-                            if (isSmoketest) {
-                                label('Windows.Amd64.ClientRS4.DevEx.15.8.Perf')
-                            }
-                            else {
-                                label('windows_server_2016_clr_perf')
-                            }
+                            label('windows_server_2016_clr_perf')
                             wrappers {
                                 credentialsBinding {
                                     string('BV_UPLOAD_SAS_TOKEN', 'CoreCLR Perf BenchView Sas')
@@ -107,6 +102,9 @@ 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')