The compute image building script autodetects the correct Go version to

install.

No issue #

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

diff --git a/tools/compute-images/arvados-images-aws.json b/tools/compute-images/arvados-images-aws.json
index 94cb24adf9d46835fb0be3012352c72bba102459..c030ea6aff97d88b43d5e8412dc990a43c548e25 100644 (file)
--- a/tools/compute-images/arvados-images-aws.json
+++ b/tools/compute-images/arvados-images-aws.json
@@ -11,6 +11,7 @@
     "public_key_file": "",
     "mksquashfs_mem": "",
     "nvidia_gpu_support": "",
     "public_key_file": "",
     "mksquashfs_mem": "",
     "nvidia_gpu_support": "",

+    "goversion": "",

     "reposuffix": "",
     "resolver": "",
     "ssh_user": "admin",
     "reposuffix": "",
     "resolver": "",
     "ssh_user": "admin",


@@ -93,6 +94,6 @@
     "type": "shell",
     "execute_command": "sudo -S env {{ .Vars }} /bin/bash '{{ .Path }}'",
     "script": "scripts/base.sh",
     "type": "shell",
     "execute_command": "sudo -S env {{ .Vars }} /bin/bash '{{ .Path }}'",
     "script": "scripts/base.sh",

-    "environment_vars": ["RESOLVER={{user `resolver`}}","REPOSUFFIX={{user `reposuffix`}}","MKSQUASHFS_MEM={{user `mksquashfs_mem`}}","NVIDIA_GPU_SUPPORT={{user `nvidia_gpu_support`}}","CLOUD=aws","AWS_EBS_AUTOSCALE={{user `aws_ebs_autoscale`}}"]
+    "environment_vars": ["RESOLVER={{user `resolver`}}","REPOSUFFIX={{user `reposuffix`}}","MKSQUASHFS_MEM={{user `mksquashfs_mem`}}","NVIDIA_GPU_SUPPORT={{user `nvidia_gpu_support`}}","CLOUD=aws","AWS_EBS_AUTOSCALE={{user `aws_ebs_autoscale`}}","GOVERSION={{user `goversion`}}"]

   }]
 }
   }]
 }

diff --git a/tools/compute-images/build.sh b/tools/compute-images/build.sh
index 769b9a5b5aaca004b6f7624369ab0ffcafc98de2..c589ffa055493c3be94c132a3c3914e6aeccb928 100755 (executable)
--- a/tools/compute-images/build.sh
+++ b/tools/compute-images/build.sh
@@ -286,6 +286,9 @@ if [[ -n "$NVIDIA_GPU_SUPPORT" ]]; then
   EXTRA2+=" -var nvidia_gpu_support=$NVIDIA_GPU_SUPPORT"
 fi
 
   EXTRA2+=" -var nvidia_gpu_support=$NVIDIA_GPU_SUPPORT"
 fi
 

+GOVERSION=$(grep 'const goversion =' ../../lib/install/deps.go |awk -F'"' '{print $2}')
+EXTRA2+=" -var goversion=$GOVERSION"
+

 echo
 packer version
 echo
 echo
 packer version
 echo

diff --git a/tools/compute-images/scripts/base.sh b/tools/compute-images/scripts/base.sh
index 260c5d47ee32c8a84af34c6490bcd0a7fa247c00..2bc41e34737801baa2ef3862403209326a54a4a6 100644 (file)
--- a/tools/compute-images/scripts/base.sh
+++ b/tools/compute-images/scripts/base.sh
@@ -115,10 +115,9 @@ $SUDO systemctl daemon-reload
 $SUDO systemctl disable docker
 
 # Get Go and build singularity
 $SUDO systemctl disable docker
 
 # Get Go and build singularity

-goversion=1.17.1

 mkdir -p /var/lib/arvados
 rm -rf /var/lib/arvados/go/
 mkdir -p /var/lib/arvados
 rm -rf /var/lib/arvados/go/

-curl -s https://storage.googleapis.com/golang/go${goversion}.linux-amd64.tar.gz | tar -C /var/lib/arvados -xzf -
+curl -s https://storage.googleapis.com/golang/go${GOVERSION}.linux-amd64.tar.gz | tar -C /var/lib/arvados -xzf -

 ln -sf /var/lib/arvados/go/bin/* /usr/local/bin/
 
 singularityversion=3.7.4
 ln -sf /var/lib/arvados/go/bin/* /usr/local/bin/
 
 singularityversion=3.7.4