Address regressions introduced in gce test net setup with image updat…

…e to latest ubuntu (#3926) * make the nodes start correctly as far as gce.sh is concerned * remove instead of comment out openssl1.1 * rename script to match its actual purpose --------- Co-authored-by: Alex Pyattaev <[email protected]>
anza-xyz · Dec 5, 2024 · e28c4df · e28c4df
1 parent 3e9af14
commit e28c4df
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/net/gce.sh b/net/gce.sh
@@ -62,7 +62,7 @@ prefix=testnet-dev-${USER//[^A-Za-z0-9]/}
 additionalValidatorCount=2
 clientNodeCount=0
 blockstreamer=false
-validatorBootDiskSizeInGb=500
+validatorBootDiskSizeInGb=100
 clientBootDiskSizeInGb=75
 validatorAdditionalDiskSizeInGb=
 externalNodes=false
@@ -802,11 +802,12 @@ $(
     solana-user-authorized_keys.sh \
     add-testnet-solana-user-authorized_keys.sh \
     install-ag.sh \
+    install-at.sh \
     install-certbot.sh \
     install-earlyoom.sh \
     install-iftop.sh \
     install-jq.sh \
-    install-libssl-compatability.sh \
+    install-libssl.sh \
     install-rsync.sh \
     install-perf.sh \
     localtime.sh \

diff --git a/net/scripts/install-at.sh b/net/scripts/install-at.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+#
+set -ex
+
+[[ $(uname) = Linux ]] || exit 1
+[[ $USER = root ]] || exit 1
+
+apt-get update
+apt-get --assume-yes install at
diff --git a/net/scripts/install-libssl-compatability.sh → net/scripts/install-libssl.sh b/net/scripts/install-libssl-compatability.sh → net/scripts/install-libssl.sh
@@ -7,9 +7,3 @@ set -ex
 # Install libssl-dev to be compatible with binaries built on an Ubuntu machine...
 apt-get update
 apt-get --assume-yes install libssl-dev
-
-# Install libssl1.1 to be compatible with binaries built in the
-# solanalabs/rust docker image
-#
-# cc: https://github.com/solana-labs/solana/issues/1090
-apt-get --assume-yes install libssl1.1