summaryrefslogtreecommitdiff
path: root/grpc/tools/gce
diff options
context:
space:
mode:
authorJoel Galenson <jgalenson@google.com>2021-04-02 14:59:08 -0700
committerJoel Galenson <jgalenson@google.com>2021-04-02 15:06:51 -0700
commit23c9e5ee44d2855e2bffb5ffe6dd0f3021be3ce2 (patch)
tree9ff33245fc40085284a777f947a77028b4a715f5 /grpc/tools/gce
parentac4642dab790b53d059713fb3d7ee44dbd605191 (diff)
downloadgrpcio-sys-23c9e5ee44d2855e2bffb5ffe6dd0f3021be3ce2.tar.gz
Upgrade rust/crates/grpcio-sys to 0.8.1
Test: make Change-Id: I333e35e7d00abaa92ea6beb00e9cf5b85840998f
Diffstat (limited to 'grpc/tools/gce')
-rwxr-xr-xgrpc/tools/gce/create_linux_kokoro_performance_worker.sh2
-rwxr-xr-xgrpc/tools/gce/create_linux_kokoro_performance_worker_from_image.sh2
-rwxr-xr-xgrpc/tools/gce/create_windows_debug_worker.sh4
-rwxr-xr-xgrpc/tools/gce/linux_kokoro_performance_worker_init.sh6
4 files changed, 7 insertions, 7 deletions
diff --git a/grpc/tools/gce/create_linux_kokoro_performance_worker.sh b/grpc/tools/gce/create_linux_kokoro_performance_worker.sh
index 63d54a48..62e0fdf4 100755
--- a/grpc/tools/gce/create_linux_kokoro_performance_worker.sh
+++ b/grpc/tools/gce/create_linux_kokoro_performance_worker.sh
@@ -30,7 +30,7 @@ CLOUD_PROJECT=grpc-testing
ZONE=us-central1-b # this zone allows 32core machines
INSTANCE_NAME="${1:-grpc-kokoro-performance-server1}"
-MACHINE_TYPE=n1-standard-32
+MACHINE_TYPE=e2-standard-32
gcloud compute instances create "$INSTANCE_NAME" \
--project="$CLOUD_PROJECT" \
diff --git a/grpc/tools/gce/create_linux_kokoro_performance_worker_from_image.sh b/grpc/tools/gce/create_linux_kokoro_performance_worker_from_image.sh
index 1b014ad4..412015f8 100755
--- a/grpc/tools/gce/create_linux_kokoro_performance_worker_from_image.sh
+++ b/grpc/tools/gce/create_linux_kokoro_performance_worker_from_image.sh
@@ -25,7 +25,7 @@ ZONE=us-central1-b # this zone allows 32core machines
LATEST_PERF_WORKER_IMAGE=grpc-performance-kokoro-v5 # update if newer image exists
INSTANCE_NAME="${1:-grpc-kokoro-performance-server}"
-MACHINE_TYPE="${2:-n1-standard-32}"
+MACHINE_TYPE="${2:-e2-standard-32}"
gcloud compute instances create "$INSTANCE_NAME" \
--project="$CLOUD_PROJECT" \
diff --git a/grpc/tools/gce/create_windows_debug_worker.sh b/grpc/tools/gce/create_windows_debug_worker.sh
index 3625df83..fe8168c1 100755
--- a/grpc/tools/gce/create_windows_debug_worker.sh
+++ b/grpc/tools/gce/create_windows_debug_worker.sh
@@ -31,7 +31,7 @@ else
INSTANCE_NAME="${USER}-windows-kokoro-debug1"
fi
-MACHINE_TYPE=n1-standard-8
+MACHINE_TYPE=e2-standard-8
TMP_DISK_NAME="$INSTANCE_NAME-temp-disk"
gcloud compute disks create "$TMP_DISK_NAME" \
@@ -50,7 +50,7 @@ gcloud compute instances create "$INSTANCE_NAME" \
--zone "$ZONE" \
--machine-type "$MACHINE_TYPE" \
--image-project google.com:kokoro \
- --image kokoro-win7build-v11-prod-debug \
+ --image kokoro-winserver2016-v2m-prod-debug \
--boot-disk-size 500 \
--boot-disk-type pd-ssd \
--tags=allow-ssh \
diff --git a/grpc/tools/gce/linux_kokoro_performance_worker_init.sh b/grpc/tools/gce/linux_kokoro_performance_worker_init.sh
index f89e81b3..e81ba212 100755
--- a/grpc/tools/gce/linux_kokoro_performance_worker_init.sh
+++ b/grpc/tools/gce/linux_kokoro_performance_worker_init.sh
@@ -74,7 +74,7 @@ sudo apt-get install -y python-psutil python3-psutil
sudo apt-get install -y google-cloud-sdk
# C++ dependencies
-sudo apt-get install -y libgflags-dev libgtest-dev libc++-dev clang
+sudo apt-get install -y libgtest-dev libc++-dev clang
# Python dependencies
sudo pip install --upgrade pip==19.3.1
@@ -162,8 +162,8 @@ gem install bundler
# PHP dependencies
sudo apt-get install -y php7.2 php7.2-dev php-pear unzip zlib1g-dev
-sudo wget https://phar.phpunit.de/phpunit-5.7.27.phar && \
- sudo mv phpunit-5.7.27.phar /usr/local/bin/phpunit && \
+sudo wget https://phar.phpunit.de/phpunit-8.5.8.phar && \
+ sudo mv phpunit-8.5.8.phar /usr/local/bin/phpunit && \
sudo chmod +x /usr/local/bin/phpunit
curl -sS https://getcomposer.org/installer | php
sudo mv composer.phar /usr/local/bin/composer