16955: a number of fixes to make the federation migration tests pass

[arvados.git] / tools / arvbox / lib / arvbox / docker / go-setup.sh

diff --git a/tools/arvbox/lib/arvbox/docker/go-setup.sh b/tools/arvbox/lib/arvbox/docker/go-setup.sh
index 21be0ccd6fc93649e587596913f2bf35388d508a..5bdc5207a388ba492032ee6c12689291d0a04281 100644 (file)
--- a/tools/arvbox/lib/arvbox/docker/go-setup.sh
+++ b/tools/arvbox/lib/arvbox/docker/go-setup.sh
@@ -8,14 +8,11 @@ mkdir -p $GOPATH
 
 cd /usr/src/arvados
 if [[ $UID = 0 ]] ; then
-  /usr/local/lib/arvbox/runsu.sh flock /var/lib/gopath/gopath.lock go mod download
-  if [[ ! -f /usr/local/bin/arvados-server ]]; then
-    /usr/local/lib/arvbox/runsu.sh flock /var/lib/gopath/gopath.lock go install git.arvados.org/arvados.git/cmd/arvados-server
-  fi
-else
-  flock /var/lib/gopath/gopath.lock go mod download
-  if [[ ! -f /usr/local/bin/arvados-server ]]; then
-    flock /var/lib/gopath/gopath.lock go install git.arvados.org/arvados.git/cmd/arvados-server
-  fi
+  RUNSU="/usr/local/lib/arvbox/runsu.sh"
+fi
+
+if [[ ! -f /usr/local/bin/arvados-server ]]; then
+  $RUNSU flock /var/lib/gopath/gopath.lock go mod download
+  $RUNSU flock /var/lib/gopath/gopath.lock go install git.arvados.org/arvados.git/cmd/arvados-server
+  $RUNSU flock /var/lib/gopath/gopath.lock install $GOPATH/bin/arvados-server /usr/local/bin
 fi
-install $GOPATH/bin/arvados-server /usr/local/bin