commit 4d629c59eb8cca946a6ae49af5c2cd4b0131045a
author Damien Martin-Guillerez <dmarting@google.com> Tue Aug 22 23:42:31 2017 +0200
committer Damien Martin-Guillerez <dmarting@google.com> Wed Aug 23 13:22:21 2017 +0200
tree 1505a68afac40a74d0d945e9f5a5a1f52716f693
parent f4bd946633ff12907cd3edf8a9a3f0fb24135e5a

Upgrade the benchmark slave to ubuntu 16.04

The benchmark job was using newer feature from git but it
was not available with the git ubuntu was providing. Probably
the old benchmark was using git provided by Jenkins.

Change-Id: I7988744e37b61ed8b23170916b6ebbcfdcea508d

gce/vm.sh

diff --git a/gce/vm.sh b/gce/vm.sh
index 21c29fd..94712de 100755
--- a/gce/vm.sh
+++ b/gce/vm.sh
@@ -67,7 +67,7 @@
     "windows-slave-3 windows-server-2012-r2-dc-v20160112-vs2015-cpp-python-msys windows-x86_64-3 europe-west1-d default windows-startup-script-ps1=jenkins-slave-windows.ps1"
     "windows-slave-4 windows-server-2012-r2-dc-v20160112-vs2015-cpp-python-msys windows-x86_64-4 europe-west1-d default windows-startup-script-ps1=jenkins-slave-windows.ps1"
     # For benchmark
-    "ubuntu-14-04-benchmark-slave ubuntu-1404-lts ubuntu_14.04-x86_64-benchmark-1 europe-west1-d default startup-script=jenkins-slave.sh ubuntu-14-04-slave.sh bootstrap-bazel.sh linux-android.sh cleanup-install.sh"
+    "ubuntu-16-04-benchmark-slave ubuntu-1604-lts ubuntu_16.04-x86_64-benchmark-1 europe-west1-d default startup-script=jenkins-slave.sh ubuntu-16-04-slave.sh bootstrap-bazel.sh linux-android.sh cleanup-install.sh"
 )
 
 # Jenkins controller for ci.bazel.io

jenkins/BUILD

diff --git a/jenkins/BUILD b/jenkins/BUILD
index d032f6f..44060b9 100644
--- a/jenkins/BUILD
+++ b/jenkins/BUILD
@@ -34,9 +34,9 @@
 
 UBUNTU_1404_COUNT = 8
 
-UBUNTU_1404_BENCHMARK_PREFIX = "ubuntu_14.04-x86_64-benchmark"
+UBUNTU_1604_BENCHMARK_PREFIX = "ubuntu_16.04-x86_64-benchmark"
 
-UBUNTU_1404_BENCHMARK_COUNT = 1
+UBUNTU_1604_BENCHMARK_COUNT = 1
 
 UBUNTU_1604_PREFIX = "ubuntu_16.04-x86_64"
 
@@ -78,8 +78,8 @@
 )
 
 jenkins_nodes(
-    UBUNTU_1404_BENCHMARK_PREFIX,
-    UBUNTU_1404_BENCHMARK_COUNT,
+    UBUNTU_1604_BENCHMARK_PREFIX,
+    UBUNTU_1604_BENCHMARK_COUNT,
     install_bazel = False,
     labels = ["benchmark"],
     mode = "EXCLUSIVE",
@@ -273,7 +273,7 @@
               jenkins_node_names(WINDOWS_PREFIX, WINDOWS_COUNT) +
               jenkins_node_names(UBUNTU_DOCKER_PREFIX, UBUNTU_DOCKER_COUNT) +
               jenkins_node_names(UBUNTU_1404_PREFIX, UBUNTU_1404_COUNT) +
-              jenkins_node_names(UBUNTU_1404_BENCHMARK_PREFIX, UBUNTU_1404_BENCHMARK_COUNT) +
+              jenkins_node_names(UBUNTU_1604_BENCHMARK_PREFIX, UBUNTU_1604_BENCHMARK_COUNT) +
               jenkins_node_names(UBUNTU_1604_PREFIX, UBUNTU_1604_COUNT) +
               jenkins_node_names(FREEBSD_11_PREFIX, FREEBSD_11_COUNT) +
               jenkins_node_names(FREEBSD_12_PREFIX, FREEBSD_12_COUNT),