hack: build ginkgo in GOPATH

Signed-off-by: Peter Hunt~ <[email protected]>
containers · Feb 6, 2023 · fffef27 · fffef27
1 parent ef8a9f2
commit fffef27
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -62,7 +62,7 @@ jobs:
       - run: hack/github-actions-setup
       - name: Run CRI-O integration tests
         run: |
-          cd cri-o
+          cd $(go env GOPATH)/src/github.com/cri-o/cri-o
           make all test-binaries
           # skip seccomp tests because they have permission denied issues in a container
           sudo -E test/test_runner.sh $(ls test/ | grep bats | grep -v seccomp)

diff --git a/hack/github-actions-setup b/hack/github-actions-setup
@@ -18,7 +18,7 @@ main() {
     install_runc
     install_cni_plugins
     install_testdeps
-	setup_etc_subid
+    setup_etc_subid
 }
 
 prepare_system() {
@@ -119,6 +119,10 @@ install_runc() {
 }
 
 install_testdeps() {
+    CLONE_PATH=$(go env GOPATH)/src/github.com/cri-o
+    mkdir -p "$CLONE_PATH"
+    pushd "$CLONE_PATH"
+
     URL=https://github.com/cri-o/cri-o
     git clone $URL
     pushd cri-o
@@ -131,11 +135,12 @@ install_testdeps() {
     sudo cp test/redhat_sigstore.yaml /etc/containers/registries.d/registry.access.redhat.com.yaml
     sudo cp test/registries.conf /etc/containers/registries.conf
     popd
+    popd
 }
 
 setup_etc_subid() {
-	echo "containers:200000:65536" | sudo tee -a /etc/subuid
-	echo "containers:200000:65536" | sudo tee -a /etc/subgid
+    echo "containers:200000:65536" | sudo tee -a /etc/subuid
+    echo "containers:200000:65536" | sudo tee -a /etc/subgid
 
 }