浏览代码

GCE: fix gce.sh startup (#7043)

    replace random deb for earlyoom with apt-get install
    update to use 24.04 ubuntu image
    remove docker requirement for any host not running 22.04 (as long as you have compatible libc you should be ok)
    fix the SSH startup script to correctly reload sshd
Alex Pyattaev 4 月之前
父节点
当前提交
df7c4a43e1
共有 4 个文件被更改,包括 4 次插入8 次删除
  1. 1 2
      net/net.sh
  2. 1 2
      net/scripts/gce-provider.sh
  3. 1 2
      net/scripts/install-earlyoom.sh
  4. 1 2
      net/scripts/network-config.sh

+ 1 - 2
net/net.sh

@@ -189,9 +189,8 @@ annotateBlockexplorerUrl() {
 }
 }
 
 
 build() {
 build() {
-  supported=("22.04")
   declare MAYBE_DOCKER=
   declare MAYBE_DOCKER=
-  if [[ $(uname) != Linux || ! " ${supported[*]} " =~ $(lsb_release -sr) ]]; then
+  if [[ $(uname) != Linux ]]; then
     # shellcheck source=ci/docker/env.sh
     # shellcheck source=ci/docker/env.sh
     source "$SOLANA_ROOT"/ci/docker/env.sh
     source "$SOLANA_ROOT"/ci/docker/env.sh
     MAYBE_DOCKER="ci/docker-run.sh ${CI_DOCKER_IMAGE:?}"
     MAYBE_DOCKER="ci/docker-run.sh ${CI_DOCKER_IMAGE:?}"

+ 1 - 2
net/scripts/gce-provider.sh

@@ -170,7 +170,6 @@ cloud_CreateInstances() {
   declare optionalBootDiskType="${10:-pd-ssd}"
   declare optionalBootDiskType="${10:-pd-ssd}"
   declare optionalAdditionalDiskSize="${11}"
   declare optionalAdditionalDiskSize="${11}"
   declare optionalPreemptible="${12}"
   declare optionalPreemptible="${12}"
-  #declare sshPrivateKey="${13}"  # unused
 
 
   if $enableGpu; then
   if $enableGpu; then
     # Custom Ubuntu 20.04 LTS image with CUDA 10.2 installed
     # Custom Ubuntu 20.04 LTS image with CUDA 10.2 installed
@@ -185,7 +184,7 @@ cloud_CreateInstances() {
     echo "Error: Not supported" >&2
     echo "Error: Not supported" >&2
     exit 1
     exit 1
   else
   else
-    imageName="ubuntu-2204-jammy-v20241119 --image-project ubuntu-os-cloud"
+    imageName="ubuntu-2404-noble-amd64-v20250709 --image-project ubuntu-os-cloud"
   fi
   fi
 
 
   declare -a nodes
   declare -a nodes

+ 1 - 2
net/scripts/install-earlyoom.sh

@@ -15,8 +15,7 @@ echo kernel.sysrq=1 >> /etc/sysctl.conf
 if command -v earlyoom; then
 if command -v earlyoom; then
   systemctl status earlyoom
   systemctl status earlyoom
 else
 else
-  wget  -r -l1 -np http://ftp.us.debian.org/debian/pool/main/e/earlyoom/ -A 'earlyoom_1.2-*_amd64.deb' -e robots=off -nd
-  apt install --quiet --yes ./earlyoom_1.2-*_amd64.deb
+  apt-get install --quiet --yes earlyoom
 
 
   cat > earlyoom <<OOM
   cat > earlyoom <<OOM
   # trigger at 20% available RAM,
   # trigger at 20% available RAM,

+ 1 - 2
net/scripts/network-config.sh

@@ -15,5 +15,4 @@ sudo sysctl -w vm.max_map_count=1000000
 echo "* - nofile 1000000" | sudo tee -a /etc/security/limits.conf
 echo "* - nofile 1000000" | sudo tee -a /etc/security/limits.conf
 
 
 echo "MaxAuthTries 60" | sudo tee -a /etc/ssh/sshd_config
 echo "MaxAuthTries 60" | sudo tee -a /etc/ssh/sshd_config
-sudo service sshd restart
-sudo systemctl restart sshd
+sudo systemctl restart ssh