Ver Fonte

Address regressions introduced in gce test net setup with image update 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 <alex.pyattaev@anza.xyz>
Alex Pyattaev há 11 meses atrás
pai
commit
e28c4df2fa
3 ficheiros alterados com 12 adições e 8 exclusões
  1. 3 2
      net/gce.sh
  2. 9 0
      net/scripts/install-at.sh
  3. 0 6
      net/scripts/install-libssl.sh

+ 3 - 2
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 \

+ 9 - 0
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

+ 0 - 6
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