From 1a62b232a9dcb6e426042c1dcc17ba9d8a7c88dc Mon Sep 17 00:00:00 2001
From: "Victor \"Nate\" Graf" <nategraf1@gmail.com>
Date: Fri, 1 Dec 2017 15:18:02 -0800
Subject: [PATCH] Change name to perf jobs to reflect the actual OS they run on
 (#15314)

* Change name fo perf jobs to reflect the actual OS they run on

* readd Ubuntu 14.04
---
 buildpipeline/perf-pipeline.groovy   | 4 ++--
 perf.groovy                          | 2 +-
 tests/scripts/run-throughput-perf.py | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/buildpipeline/perf-pipeline.groovy b/buildpipeline/perf-pipeline.groovy
index 2251f3c..5921cf6 100644
--- a/buildpipeline/perf-pipeline.groovy
+++ b/buildpipeline/perf-pipeline.groovy
@@ -365,13 +365,13 @@ if (!isPR()) {
             ['pgo', 'nopgo'].each { pgo_enabled ->
                 outerLoopTests["linux ${arch} ryujit ${opt_level} ${pgo_enabled} perf"] = {
                     simpleNode('ubuntu_1604_clr_perf', 180) {
-                        linuxPerf(arch, 'Ubuntu14.04', config, uploadString, runType, opt_level, pgo_enabled, false)
+                        linuxPerf(arch, 'Ubuntu16.04', config, uploadString, runType, opt_level, pgo_enabled, false)
                     }
                 }
 
                 outerLoopTests["linux ${arch} ryujit ${opt_level} ${pgo_enabled} throughput"] = {
                     simpleNode('ubuntu_1604_clr_perf', 180) {
-                        linuxThroughput(arch, 'Ubuntu14.04', config, uploadString, runType, opt_level, pgo_enabled, false)
+                        linuxThroughput(arch, 'Ubuntu16.04', config, uploadString, runType, opt_level, pgo_enabled, false)
                     }
                 }
             }
diff --git a/perf.groovy b/perf.groovy
index a87bf83..19de486 100644
--- a/perf.groovy
+++ b/perf.groovy
@@ -267,7 +267,7 @@ def static getFullPerfJobName(def project, def os, def isPR) {
 
 
     // Actual perf testing on the following OSes
-    def perfOSList = ['Ubuntu14.04']
+    def perfOSList = ['Ubuntu16.04']
     perfOSList.each { os ->
         def newJob = job(getFullPerfJobName(project, os, isPR)) {
 
diff --git a/tests/scripts/run-throughput-perf.py b/tests/scripts/run-throughput-perf.py
index 3763b92..77a0811 100644
--- a/tests/scripts/run-throughput-perf.py
+++ b/tests/scripts/run-throughput-perf.py
@@ -93,7 +93,8 @@ jit_list = {
 
 os_group_list = {
     'Windows_NT': 'Windows_NT',
-    'Ubuntu14.04': 'Linux'
+    'Ubuntu14.04': 'Linux',
+    'Ubuntu16.04': 'Linux'
 }
 
 python_exe_list = {
@@ -168,7 +169,7 @@ def validate_args(args):
     valid_archs = {'Windows_NT': ['x86', 'x64'], 'Linux': ['x64']}
     valid_build_types = ['Release']
     valid_run_types = ['rolling', 'private']
-    valid_os = ['Windows_NT', 'Ubuntu14.04']
+    valid_os = ['Windows_NT', 'Ubuntu14.04', 'Ubuntu16.04']
     valid_opt_levels = ['full_opt', 'min_opt']
     valid_jit_names = {'x64': ['ryujit'], 'x86': ['ryujit', 'legacy_backend']}
 
-- 
2.7.4