diff options
| author |  David G. Quintas <dgq@google.com> | 2016-03-31 22:17:45 -0700 |
|---|---|---|
| committer | David G. Quintas <dgq@google.com> | 2016-03-31 22:17:45 -0700 |
| commit | 95d6767bf3dcd6516bb995b822725f8ff4e85ab6 (patch) | |
| tree | 7ea75eb2ece80f93fcaf1b25f2bb0178e6ed9732 /tools/gce | |
| parent | 1e681c2474d560254d3d26116ec3574a060dcfcd (diff) | |
| parent | 7661da5b417130262ded988b2f881ab619d3b244 (diff) | |
Merge branch 'master' into sockaddr_resolver_lb_2
Diffstat (limited to 'tools/gce')
| -rwxr-xr-x | tools/gce/create_linux_performance_worker.sh | 2 | ||||
| -rwxr-xr-x | tools/gce/create_linux_worker.sh | 2 | ||||
| -rwxr-xr-x | tools/gce/linux_performance_worker_init.sh | 9 | ||||
| -rwxr-xr-x | tools/gce/linux_worker_init.sh | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/tools/gce/create_linux_performance_worker.sh b/tools/gce/create_linux_performance_worker.sh index 720fc80a0d..dfe095ca33 100755 --- a/tools/gce/create_linux_performance_worker.sh +++ b/tools/gce/create_linux_performance_worker.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2015-2016, Google Inc. +# Copyright 2015, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/gce/create_linux_worker.sh b/tools/gce/create_linux_worker.sh index 399e3ec4e4..dff0b1ce5f 100755 --- a/tools/gce/create_linux_worker.sh +++ b/tools/gce/create_linux_worker.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2015-2016, Google Inc. +# Copyright 2015, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/gce/linux_performance_worker_init.sh b/tools/gce/linux_performance_worker_init.sh index bae2b51106..8f58afdb29 100755 --- a/tools/gce/linux_performance_worker_init.sh +++ b/tools/gce/linux_performance_worker_init.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2015-2016, Google Inc. +# Copyright 2015, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -36,8 +36,8 @@ set -ex sudo apt-get update -# Install JRE -sudo apt-get install -y openjdk-7-jre +# Install Java 8 JDK (to build gRPC Java) +sudo apt-get install -y openjdk-8-jdk sudo apt-get install -y unzip lsof # Setup jenkins user (or the user will already exist bcuz magic) @@ -90,6 +90,7 @@ sudo pypy get-pip.py sudo pypy -m pip install tabulate # Node dependences. +# TODO(jtattermusch) nvm has to be installed under user jenkins touch .profile curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash nvm install 0.12 && npm config set cache /tmp/npm-cache @@ -104,3 +105,5 @@ sudo apt-get install -y mono-devel nuget # Ruby dependencies gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 curl -sSL https://get.rvm.io | bash -s stable --ruby + +# Java dependencies - nothing as we already have Java JDK 8 diff --git a/tools/gce/linux_worker_init.sh b/tools/gce/linux_worker_init.sh index f56cac0ce2..ef6a5d175c 100755 --- a/tools/gce/linux_worker_init.sh +++ b/tools/gce/linux_worker_init.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2015-2016, Google Inc. +# Copyright 2015, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without |