From 574f485e1acad7943ece96a103f9333e783f407a Mon Sep 17 00:00:00 2001
From: Juan Diego Gonzalez <gojuan@vmware.com>
Date: Fri, 16 Dec 2022 21:01:00 +0000
Subject: [PATCH] Cleans integration test

Co-authored-by: Juan Diego Gonzalez <gojuan@vmware.com>
---
 .github/workflows/cf-env-setup.yml          |  7 -------
 .github/workflows/run-integration-tests.yml | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/cf-env-setup.yml b/.github/workflows/cf-env-setup.yml
index 9308a80f708..cd2d5ea320f 100644
--- a/.github/workflows/cf-env-setup.yml
+++ b/.github/workflows/cf-env-setup.yml
@@ -88,13 +88,6 @@ jobs:
           repository: cloudfoundry/cf-deployment-concourse-tasks
           path: cf-deployment-concourse-tasks
 
-      - name: Checkout cli
-        uses: actions/checkout@v3
-        with:
-          repository: cloudfoundry/cli
-          path: cli
-          ref: linux-min-capi-int-test
-
       - name: Install Tools
         run: |
           wget https://github.com/cloudfoundry/bosh-bootloader/releases/download/v8.4.110/bbl-v8.4.110_linux_x86-64 -P /tmp
diff --git a/.github/workflows/run-integration-tests.yml b/.github/workflows/run-integration-tests.yml
index fc68c35faf1..a5f26d113c6 100644
--- a/.github/workflows/run-integration-tests.yml
+++ b/.github/workflows/run-integration-tests.yml
@@ -23,6 +23,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          path: cli
       - name: Set Up Go
         uses: actions/setup-go@v3
         with:
@@ -52,6 +54,8 @@ jobs:
       - name: Run Integration Tests
         if: ${{ !inputs.run-with-client-creds }}
         run: |
+          mkdir -p go/src/code.cloudfoundry.org
+          ln -s ${PWD}/cli go/src/code.cloudfoundry.org
           ENV=$(cat metadata.json | jq -r '.name')
           eval "$(bbl print-env --metadata-file ./metadata.json)"
           export CF_INT_PASSWORD="$(credhub get -n /bosh-$ENV/cf/cf_admin_password | bosh interpolate --path /value -)"
@@ -64,14 +68,16 @@ jobs:
           export NODES=16
           export GOPATH=$PWD/go
           export PATH=$GOPATH/bin:$PATH
-          go install github.com/onsi/ginkgo/ginkgo@v1.16.4
 
+          cd $GOPATH/src/code.cloudfoundry.org/cli
+          go install github.com/onsi/ginkgo/ginkgo@v1.16.4
 
           make build
           export PATH="$(pwd)/out:$PATH"
           export CF_PASSWORD=${CF_INT_PASSWORD}
           cf api ${CF_INT_API} --skip-ssl-validation
           cf auth
+
           make integration-tests-full-ci
       - name: Run Integration Tests with client credentials
         if: ${{ inputs.run-with-client-creds }}
@@ -79,6 +85,8 @@ jobs:
           CF_INT_CLIENT_ID: 'potato-face'
           CF_INT_CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
         run: |
+          mkdir -p go/src/code.cloudfoundry.org
+          ln -s ${PWD}/cli go/src/code.cloudfoundry.org
           ENV=$(cat metadata.json | jq -r '.name')
           eval "$(bbl print-env --metadata-file ./metadata.json)"
           export CF_INT_PASSWORD="$(credhub get -n /bosh-$ENV/cf/cf_admin_password | bosh interpolate --path /value -)"
@@ -91,6 +99,8 @@ jobs:
           export NODES=16
           export GOPATH=$PWD/go
           export PATH=$GOPATH/bin:$PATH
+
+          cd $GOPATH/src/code.cloudfoundry.org/cli
           go install github.com/onsi/ginkgo/ginkgo@v1.16.4
 
           make build
@@ -98,4 +108,5 @@ jobs:
           export CF_PASSWORD=${CF_INT_PASSWORD}
           cf api ${CF_INT_API} --skip-ssl-validation
           cf auth
+
           make integration-tests-full-ci