Move everything that needs GOPATH to a new GOPATH

Also build and move grootfs and tardis binaries to
GOPATH/bin in the test script instead of building them in guardian GQTs

[#164336113]

Co-authored-by: Danail Branekov <danailster@gmail.com>
Co-authored-by: Tom Godkin <tgodkin@pivotal.io>

.envrc

@@ -1,4 +1,4 @@
-export GOPATH=$PWD
+export GOPATH=$PWD/src/gopath
 export PATH=$PWD/bin:$PATH
 
 # Tests log level

.gitignore

@@ -30,3 +30,4 @@ blobs
 .vagrant/
 /pkg
 /bin
+src/gopath/bin

.gitmodules

@@ -1,57 +1,57 @@
-[submodule "src/code.cloudfoundry.org/guardian"]
-	path = src/code.cloudfoundry.org/guardian
+[submodule "src/gopath/src/code.cloudfoundry.org/guardian"]
+	path = src/gopath/src/code.cloudfoundry.org/guardian
 	url = https://github.com/cloudfoundry/guardian
 	branch = master
-[submodule "src/github.com/onsi/gomega"]
-	path = src/github.com/onsi/gomega
+[submodule "src/gopath/src/github.com/onsi/gomega"]
+	path = src/gopath/src/github.com/onsi/gomega
 	url = https://github.com/onsi/gomega
 	branch = master
-[submodule "src/github.com/tedsuo/rata"]
-	path = src/github.com/tedsuo/rata
+[submodule "src/gopath/src/github.com/tedsuo/rata"]
+	path = src/gopath/src/github.com/tedsuo/rata
 	url = https://github.com/tedsuo/rata
 	branch = master
-[submodule "src/code.cloudfoundry.org/garden"]
-	path = src/code.cloudfoundry.org/garden
+[submodule "src/gopath/src/code.cloudfoundry.org/garden"]
+	path = src/gopath/src/code.cloudfoundry.org/garden
 	url = https://github.com/cloudfoundry/garden
 	branch = master
-[submodule "src/github.com/onsi/ginkgo"]
-	path = src/github.com/onsi/ginkgo
+[submodule "src/gopath/src/github.com/onsi/ginkgo"]
+	path = src/gopath/src/github.com/onsi/ginkgo
 	url = https://github.com/onsi/ginkgo
 	branch = master
-[submodule "src/github.com/bmizerany/pat"]
-	path = src/github.com/bmizerany/pat
+[submodule "src/gopath/src/github.com/bmizerany/pat"]
+	path = src/gopath/src/github.com/bmizerany/pat
 	url = https://github.com/bmizerany/pat
 	branch = master
-[submodule "src/gopkg.in/yaml.v2"]
-	path = src/gopkg.in/yaml.v2
+[submodule "src/gopath/src/gopkg.in/yaml.v2"]
+	path = src/gopath/src/gopkg.in/yaml.v2
 	url = https://gopkg.in/yaml.v2
 	branch = v2
-[submodule "src/code.cloudfoundry.org/lager"]
-	path = src/code.cloudfoundry.org/lager
+[submodule "src/gopath/src/code.cloudfoundry.org/lager"]
+	path = src/gopath/src/code.cloudfoundry.org/lager
 	url = https://github.com/cloudfoundry/lager
 	branch = master
-[submodule "src/code.cloudfoundry.org/garden-integration-tests"]
-	path = src/code.cloudfoundry.org/garden-integration-tests
+[submodule "src/gopath/src/code.cloudfoundry.org/garden-integration-tests"]
+	path = src/gopath/src/code.cloudfoundry.org/garden-integration-tests
 	url = https://github.com/cloudfoundry/garden-integration-tests
 	branch = master
-[submodule "src/github.com/golang/protobuf"]
-	path = src/github.com/golang/protobuf
+[submodule "src/gopath/src/github.com/golang/protobuf"]
+	path = src/gopath/src/github.com/golang/protobuf
 	url = https://github.com/golang/protobuf
 	branch = master
-[submodule "src/code.cloudfoundry.org/grootfs"]
-	path = src/code.cloudfoundry.org/grootfs
+[submodule "src/gopath/src/code.cloudfoundry.org/grootfs"]
+	path = src/gopath/src/code.cloudfoundry.org/grootfs
 	url = https://github.com/cloudfoundry/grootfs
 	branch = master
-[submodule "src/github.com/containerd/containerd"]
-	path = src/github.com/containerd/containerd
+[submodule "src/gopath/src/github.com/containerd/containerd"]
+	path = src/gopath/src/github.com/containerd/containerd
 	url = https://github.com/containerd/containerd
 	branch = master
-[submodule "src/code.cloudfoundry.org/archiver"]
-	path = src/code.cloudfoundry.org/archiver
+[submodule "src/gopath/src/code.cloudfoundry.org/archiver"]
+	path = src/gopath/src/code.cloudfoundry.org/archiver
 	url = https://github.com/cloudfoundry/archiver
 	branch = master
-[submodule "src/github.com/opencontainers/runc"]
-	path = src/github.com/opencontainers/runc
+[submodule "src/gopath/src/github.com/opencontainers/runc"]
+	path = src/gopath/src/github.com/opencontainers/runc
 	url = https://github.com/opencontainers/runc
 	branch = master
 [submodule "src/idmapper"]

ci/helpers/gats-utils

@@ -2,7 +2,7 @@
 build_nstar() {
   local grreleasedevelopdir="$1"
 
-  pushd "$grreleasedevelopdir"/src/code.cloudfoundry.org/guardian/rundmc/nstar
+  pushd "$grreleasedevelopdir"/src/gopath/src/code.cloudfoundry.org/guardian/rundmc/nstar
     make
     mv nstar $GOPATH/bin/
   popd
@@ -13,7 +13,7 @@ build_grootfs() {
   local target="${GOPATH}/bin"
 
   (
-    cd "$grreleasedevelopdir"/src/code.cloudfoundry.org/grootfs
+    cd "$grreleasedevelopdir"/src/gopath/src/code.cloudfoundry.org/grootfs
 
     unset GOPATH
 
@@ -27,7 +27,7 @@ build_gdn() {
   local target="${GOPATH}/bin"
 
   (
-    cd "${grreleasedevelop}/src/code.cloudfoundry.org/guardian"
+    cd "${grreleasedevelop}/src/gopath/src/code.cloudfoundry.org/guardian"
 
     unset GOPATH
 

ci/scripts/containerd

@@ -8,18 +8,22 @@ source "$grr_base/ci/helpers/device-control"
 
 # shellcheck source=../../src/build/runc.bash
 source "$grr_base/src/build/runc.bash"
+# shellcheck source=../../src/build/grootfs.bash
+source "$grr_base/src/build/grootfs.bash"
 
 export GOROOT=/usr/local/go
 export PATH=$GOROOT/bin:$PATH
 
-export GOPATH=$grr_base
+export GOPATH="$grr_base/src/gopath"
 export PATH=$HOME/go/bin:$GOPATH/bin:$PATH
 
+mkdir -p "${GOPATH}/bin"
 build_runc "$grr_base" "${GOPATH}/bin"
+build_grootfs "$grr_base" "${GOPATH}/bin"
 
 #TODO: Figure out how to get rid of the containerd git-related errors below
 echo -e "=========================================\n\n\n\nDuring containerd compilation you will get git fatals that complain of containerd directory not being a git repository. You can safely ignore them :)\n\n\n\n========================================="
-pushd "$grr_base"/src/github.com/containerd/containerd
+pushd "$GOPATH"/src/github.com/containerd/containerd
   BUILDTAGS=no_btrfs make && make install
 popd
 
@@ -42,7 +46,7 @@ go version
 
 echo "compiling test process: $(date)"
 
-cd "$grr_base"/src/code.cloudfoundry.org/guardian
+cd "$grr_base"/src/gopath/src/code.cloudfoundry.org/guardian
 
 if [ -z "${NO_GO_VET:-}" ]; then
   go vet ./...

ci/scripts/garden

@@ -6,10 +6,10 @@ cd "$( dirname "$0" )/../.."
 export GOROOT=/usr/local/go
 export PATH=$GOROOT/bin:$PATH
 
-export GOPATH=$PWD
+export GOPATH=$PWD/src/gopath
 export PATH=$GOPATH/bin:$PATH
 
-cd src/code.cloudfoundry.org/garden
+cd src/gopath/src/code.cloudfoundry.org/garden
 
 go vet ./...
 ginkgo -r -p --race --keepGoing --nodes="${GINKGO_NODES:-8}" --failOnPending --randomizeSuites --randomizeAllSpecs "$@"

ci/scripts/gdn-linux

@@ -32,7 +32,7 @@ function prepare() {
 }
 
 function test() {
-  cd src/code.cloudfoundry.org/garden-integration-tests
+  cd src/gopath/src/code.cloudfoundry.org/garden-integration-tests
 
   cmd="ginkgo -p --nodes=${GINKGO_NODES:-8} --failOnPending --randomizeSuites --randomizeAllSpecs $*"
   if [ -n "${SLOW_MOBIUS_TIME_LIMIT_SECONDS:-}" ]; then
@@ -44,7 +44,7 @@ function test() {
 
 cd "$( dirname "$0" )/../.."
 
-export GOPATH=$PWD
+export GOPATH=$PWD/src/gopath
 export PATH=$GOPATH/bin:$PATH
 export tmpdir=/tmp/dir
 

ci/scripts/gdn-linux-standalone

@@ -9,14 +9,14 @@ set -ex
 # shellcheck source=../../src/build/runc.bash
 source "$( dirname "$0" )/../../src/build/runc.bash"
 
-export GOPATH=$PWD/gr-release-develop
+export GOPATH=$PWD/gr-release-develop/src/gopath
 export PATH=$PATH:$GOPATH/bin
 
 basedir=$PWD
 
 # If you want to fly execute this, you will have to pass DEV_MODE=true
 if [ -z "$DEV_MODE" ]; then
-  gdn_version=$(cd gr-release-develop/src/code.cloudfoundry.org/guardian && git rev-parse HEAD)
+  gdn_version=$(cd gr-release-develop/src/gopath/src/code.cloudfoundry.org/guardian && git rev-parse HEAD)
   gdn_build_ldflags="-X main.version=${gdn_version}"
 fi
 
@@ -45,25 +45,25 @@ function build() {
     (
       (
         unset GOPATH
-        cd src/code.cloudfoundry.org/guardian
+        cd src/gopath/src/code.cloudfoundry.org/guardian
         go build -mod vendor -o "${LINUX_ASSETS}/bin/dadoo" ./cmd/dadoo
       )
 
       build_runc "$PWD" "${LINUX_ASSETS}/bin"
 
-      pushd src/code.cloudfoundry.org/guardian/rundmc/nstar
+      pushd src/gopath/src/code.cloudfoundry.org/guardian/rundmc/nstar
         make
         mv nstar "${LINUX_ASSETS}/bin"
       popd
 
-      pushd src/code.cloudfoundry.org/guardian/cmd/init
+      pushd src/gopath/src/code.cloudfoundry.org/guardian/cmd/init
         gcc -static -o init init.c ignore_sigchild.c
         mv init "${LINUX_ASSETS}/bin"
       popd
 
 
       (
-        cd src/code.cloudfoundry.org/grootfs
+        cd src/gopath/src/code.cloudfoundry.org/grootfs
 
         unset GOPATH
 
@@ -73,10 +73,10 @@ function build() {
     )
   popd
 
-  go-bindata -nomemcopy -pkg bindata -o gr-release-develop/src/code.cloudfoundry.org/guardian/bindata/bindata.go linux/...
+  go-bindata -nomemcopy -pkg bindata -o gr-release-develop/src/gopath/src/code.cloudfoundry.org/guardian/bindata/bindata.go linux/...
 
   (
-    cd gr-release-develop/src/code.cloudfoundry.org/guardian
+    cd gr-release-develop/src/gopath/src/code.cloudfoundry.org/guardian
 
     unset GOPATH
 

ci/scripts/guardian

@@ -8,14 +8,18 @@ source "$grr_base/ci/helpers/device-control"
 
 # shellcheck source=../../src/build/runc.bash
 source "$grr_base/src/build/runc.bash"
+# shellcheck source=../../src/build/grootfs.bash
+source "$grr_base/src/build/grootfs.bash"
 
 export GOROOT=/usr/local/go
 export PATH=$GOROOT/bin:$PATH
 
-export GOPATH=$grr_base
+export GOPATH="${grr_base}/src/gopath"
 export PATH=$HOME/go/bin:$GOPATH/bin:$PATH
 
+mkdir -p "${GOPATH}/bin"
 build_runc "$grr_base" "${GOPATH}/bin"
+build_grootfs "$grr_base" "${GOPATH}/bin"
 
 if [[ "$CONTAINERD_ENABLED" == "true" ]] ; then
   #TODO: Figure out how to get rid of the containerd git-related errors below
@@ -44,7 +48,7 @@ go version
 
 echo "compiling test process: $(date)"
 
-cd "$grr_base"/src/code.cloudfoundry.org/guardian
+cd "$grr_base"/src/gopath/src/code.cloudfoundry.org/guardian
 
 if [ -z "${NO_GO_VET:-}" ]; then
   go vet ./...

ci/scripts/guardian-windows.ps1

@@ -3,16 +3,18 @@ trap { $host.SetShouldExit(1) }
 
 cd gr-release-develop
 
-$env:GOPATH = $PWD
+$env:PWD = (Get-Location)
+$env:GOPATH = ${env:PWD} + "\src\gopath"
 $env:PATH = $env:GOPATH + "/bin;C:/go/bin;" + $env:PATH
 
 Write-Host "Installing Ginkgo"
-go.exe install ./src/github.com/onsi/ginkgo/ginkgo
+go.exe install ./src/gopath/src/github.com/onsi/ginkgo/ginkgo
 if ($LastExitCode -ne 0) {
     throw "Ginkgo installation process returned error code: $LastExitCode"
 }
 
-cd src/code.cloudfoundry.org/guardian
+$guardian_path = ${env:GOPATH} + "/src/code.cloudfoundry.org/guardian"
+cd ${guardian_path}
 
 go version
 go vet ./...

ci/scripts/non-nested-gats

@@ -5,7 +5,7 @@ base=$PWD
 
 cd "$( dirname "$0" )/../.."
 
-export GOPATH=$PWD
+export GOPATH=$PWD/src/gopath
 export PATH=$PWD/bin:$PATH
 
 cd src/code.cloudfoundry.org/garden-integration-tests

ci/scripts/performance-tests

@@ -3,7 +3,7 @@ set -ex
 
 cd "$( dirname "$0" )/../.."
 
-export GOPATH=$PWD
+export GOPATH=$PWD/src/gopath
 export PATH=$PWD/bin:$PATH
 
 cd src/code.cloudfoundry.org/garden-integration-tests

scripts/test

@@ -23,12 +23,12 @@ usage() {
 go_vet_and_fmt() {
   cd "$ROOT_DIR_PATH"
 
-  pushd src/code.cloudfoundry.org/guardian
+  pushd src/gopath/src/code.cloudfoundry.org/guardian
     GOOS=linux go vet ./...
     go fmt ./...
   popd
 
-  pushd src/code.cloudfoundry.org/garden
+  pushd src/gopath/src/code.cloudfoundry.org/garden
     GOOS=linux go vet ./...
     go fmt ./...
   popd

src/build/grootfs.bash

@@ -0,0 +1,14 @@
+function build_grootfs() {
+  local garden_runc_release_dir="$1"
+  local target="$2"
+
+  (
+    unset GOPATH
+    cd "$garden_runc_release_dir/src/gopath/src/code.cloudfoundry.org/grootfs" || exit
+    make all
+
+    chmod 04755 build/tardis
+
+    mv build/{grootfs,tardis} "$target"
+  )
+}

src/build/runc.bash

@@ -2,12 +2,14 @@
 source "$(dirname "${BASH_SOURCE[0]}")"/../patches/patch.bash
 
 function build_runc() {
-  garden_runc_release_dir="$1"
-  dest_dir="$2"
+  local garden_runc_release_dir="$1"
+  local target="$2"
+
+  (
+    cd "$garden_runc_release_dir/src/gopath/src/github.com/opencontainers/runc" || exit
 
-  pushd "$garden_runc_release_dir/src/github.com/opencontainers/runc"
     apply_patches "$garden_runc_release_dir/src/patches/runc"
     make BUILDTAGS='seccomp apparmor' static
-    mv runc "$dest_dir"
-  popd
+    mv runc "$target"
+  )
 }