Move grootfs out of the gopath

[#164336113]
cloudfoundry · Mar 18, 2019 · 5d8192f · 5d8192f
1 parent ee3f40e
commit 5d8192f
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -38,8 +38,8 @@
 	path = src/gopath/src/github.com/golang/protobuf
 	url = https://github.com/golang/protobuf
 	branch = master
-[submodule "src/gopath/src/code.cloudfoundry.org/grootfs"]
-	path = src/gopath/src/code.cloudfoundry.org/grootfs
+[submodule "src/grootfs"]
+	path = src/grootfs
 	url = https://github.com/cloudfoundry/grootfs
 	branch = master
 [submodule "src/gopath/src/github.com/containerd/containerd"]

diff --git a/ci/helpers/gats-utils b/ci/helpers/gats-utils
@@ -13,7 +13,7 @@ build_grootfs() {
   local target="${GOPATH}/bin"
 
   (
-    cd "$grreleasedevelopdir"/src/gopath/src/code.cloudfoundry.org/grootfs
+    cd "$grreleasedevelopdir"/src/grootfs
 
     unset GOPATH
 

diff --git a/ci/scripts/gdn-linux-standalone b/ci/scripts/gdn-linux-standalone
@@ -63,7 +63,7 @@ function build() {
 
 
       (
-        cd src/gopath/src/code.cloudfoundry.org/grootfs
+        cd src/grootfs
 
         unset GOPATH
 

diff --git a/ci/tasks/grootfs-go-vet.yml b/ci/tasks/grootfs-go-vet.yml
@@ -15,6 +15,6 @@ caches:
 - path: gr-release-develop/pkg
 
 run:
-  dir: gr-release-develop/src/gopath/src/code.cloudfoundry.org/grootfs
+  dir: gr-release-develop/src/grootfs
   path: make
   args: [go-vet]
diff --git a/ci/tasks/grootfs-integration.yml b/ci/tasks/grootfs-integration.yml
@@ -22,6 +22,6 @@ params:
   GROOTFS_USER: whoever
 
 run:
-  dir: gr-release-develop/src/gopath/src/code.cloudfoundry.org/grootfs
+  dir: gr-release-develop/src/grootfs
   path: ci/scripts/integration-tests.sh
   user: root
diff --git a/ci/tasks/grootfs-make.yml b/ci/tasks/grootfs-make.yml
@@ -15,7 +15,7 @@ caches:
 - path: gr-release-develop/pkg
 
 run:
-  dir: gr-release-develop/src/gopath/src/code.cloudfoundry.org/grootfs
+  dir: gr-release-develop/src/grootfs
   path: make
   user: root
 
diff --git a/ci/tasks/grootfs-unit.yml b/ci/tasks/grootfs-unit.yml
@@ -20,6 +20,6 @@ params:
   GROOTFS_USER: whoever
 
 run:
-  dir: gr-release-develop/src/gopath/src/code.cloudfoundry.org/grootfs
+  dir: gr-release-develop/src/grootfs
   path: ci/scripts/unit-tests.sh
   user: root
diff --git a/packages/grootfs/packaging b/packages/grootfs/packaging
@@ -6,7 +6,7 @@ source build/bosh-compilation-golang
 
 mkdir "${BOSH_INSTALL_TARGET}/bin"
 
-cd ./gopath/src/code.cloudfoundry.org/grootfs
+cd ./grootfs
 
 make cf
 make prefix="${BOSH_INSTALL_TARGET}/bin" install

diff --git a/packages/grootfs/spec b/packages/grootfs/spec
@@ -5,5 +5,5 @@ dependencies:
   - golang
 
 files:
-  - gopath/src/code.cloudfoundry.org/grootfs/**/*
+  - grootfs/**/*
   - build/bosh-compilation-golang
diff --git a/src/build/grootfs.bash b/src/build/grootfs.bash
@@ -4,7 +4,7 @@ function build_grootfs() {
 
   (
     unset GOPATH
-    cd "$garden_runc_release_dir/src/gopath/src/code.cloudfoundry.org/grootfs" || exit
+    cd "$garden_runc_release_dir/src/grootfs" || exit
     make all
 
     chmod 04755 build/tardis

diff --git a/src/gopath/src/code.cloudfoundry.org/grootfs → src/grootfs b/src/gopath/src/code.cloudfoundry.org/grootfs → src/grootfs