Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gceworker: update ubuntu to 20.04 #68432

Merged
merged 1 commit into from Nov 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 2 additions & 3 deletions build/bootstrap/bootstrap-debian.sh
Expand Up @@ -6,7 +6,7 @@
set -euxo pipefail

curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | sudo apt-key add -
echo "deb https://deb.nodesource.com/node_12.x xenial main" | sudo tee /etc/apt/sources.list.d/nodesource.list
echo "deb https://deb.nodesource.com/node_16.x focal main" | sudo tee /etc/apt/sources.list.d/nodesource.list

curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
Expand All @@ -16,7 +16,6 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y -o Dpkg::Options::="
sudo apt-get install -y --no-install-recommends \
mosh \
autoconf \
cmake \
ccache \
docker.io \
libncurses-dev \
Expand All @@ -42,7 +41,7 @@ curl -fsSL https://github.com/Kitware/CMake/releases/download/v3.20.3/cmake-3.20
sha256sum -c - <<EOF
97bf730372f9900b2dfb9206fccbcf92f5c7f3b502148b832e77451aa0f9e0e6 /tmp/cmake.tgz
EOF
sudo tar -C /usr -zxf /tmp/cmake.tgz && rm /tmp/cmake.tgz
sudo tar -C /usr --strip-components=1 -zxf /tmp/cmake.tgz && rm /tmp/cmake.tgz

# Install Go.
trap 'rm -f /tmp/go.tgz' EXIT
Expand Down
4 changes: 3 additions & 1 deletion scripts/gceworker.sh
Expand Up @@ -32,13 +32,15 @@ case "${cmd}" in
--network "default" \
--maintenance-policy "MIGRATE" \
--image-project "ubuntu-os-cloud" \
--image-family "ubuntu-1804-lts" \
--image-family "ubuntu-2004-lts" \
--boot-disk-size "100" \
--boot-disk-type "pd-ssd" \
--boot-disk-device-name "${NAME}" \
--scopes "cloud-platform"
gcloud compute firewall-rules create "${NAME}-mosh" --allow udp:60000-61000

# wait a bit to let gcloud create the instance before retrying
sleep 30s
# Retry while vm and sshd start up.
retry gcloud compute ssh "${NAME}" --command=true

Expand Down