[ARVADOS-DEV] updated: 90b507ea4dc647e90b50483ed3910206ae2649f8

[Git user]

Summary of changes:
 .../packer-images/jenkins-image-arvados-tests.sh    | 21 ++++++++++++---------
 jenkins/packer-images/jenkins-image-common.sh       |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

       via  90b507ea4dc647e90b50483ed3910206ae2649f8 (commit)
      from  ace19590c487a5705fbeadd54c1bd4062cdd14fd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 90b507ea4dc647e90b50483ed3910206ae2649f8
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Apr 13 12:53:25 2022 -0400

    Our base test image installs the correct version of Go (detected in the
    usual way from the Arvados source tree).
    
    Check out the git tree using the git protocol, not http.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/jenkins/packer-images/jenkins-image-arvados-tests.sh b/jenkins/packer-images/jenkins-image-arvados-tests.sh
index 4c29498..c2a9a8f 100755
--- a/jenkins/packer-images/jenkins-image-arvados-tests.sh
+++ b/jenkins/packer-images/jenkins-image-arvados-tests.sh
@@ -9,18 +9,21 @@ set -eo pipefail
 # Install the dependencies for arvados-server
 sudo su -c "DEBIAN_FRONTEND=noninteractive apt-get install -y libpam0g-dev wget build-essential"
 
-# Get Go 1.16.3
-cd /usr/src
-sudo wget https://golang.org/dl/go1.16.3.linux-amd64.tar.gz
-sudo tar xzf go1.16.3.linux-amd64.tar.gz
-sudo ln -s /usr/src/go/bin/go /usr/local/bin/go-1.16.3
-sudo ln -s /usr/src/go/bin/gofmt /usr/local/bin/gofmt-1.16.3
-sudo ln -s /usr/local/bin/go-1.16.3 /usr/local/bin/go
-sudo ln -s /usr/local/bin/gofmt-1.16.3 /usr/local/bin/gofmt
-
 # Check out a local copy of the arvados repo so we can use it to install the dependencies
 cd /usr/src
 sudo git clone arvados.git
+
+# Install the correct version of Go
+GO_VERSION=`grep 'const goversion =' /usr/src/arvados/lib/install/deps.go |awk -F'"' '{print $2}'`
+cd /usr/src
+sudo wget https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz
+sudo tar xzf go${GO_VERSION}.linux-amd64.tar.gz
+sudo ln -s /usr/src/go/bin/go /usr/local/bin/go-${GO_VERSION}
+sudo ln -s /usr/src/go/bin/gofmt /usr/local/bin/gofmt-${GO_VERSION}
+sudo ln -s /usr/local/bin/go-${GO_VERSION} /usr/local/bin/go
+sudo ln -s /usr/local/bin/gofmt-${GO_VERSION} /usr/local/bin/gofmt
+
+# Preseed our dependencies
 cd arvados
 sudo go mod download
 sudo go run ./cmd/arvados-server install -type test
diff --git a/jenkins/packer-images/jenkins-image-common.sh b/jenkins/packer-images/jenkins-image-common.sh
index 6f83c38..e68b092 100755
--- a/jenkins/packer-images/jenkins-image-common.sh
+++ b/jenkins/packer-images/jenkins-image-common.sh
@@ -42,7 +42,7 @@ sudo su -c "${POSTINSTALL_CMD}"
 # create a reference repository (bare git repo)
 # jenkins will use this to speed up the checkout for each job
 cd /usr/src
-sudo git clone --mirror https://git.arvados.org/arvados.git
+sudo git clone --mirror git://git.arvados.org/arvados.git
 sudo chown jenkins:jenkins arvados.git -R
 
 # Jenkins will use this script to determine when the node is ready for use

-----------------------------------------------------------------------


hooks/post-receive
--