Remove latest capi from being deployed (#2768)

* Remove latest capi from being deployed

- the latest capi being deployed was from the capi job [create-capi-release](https://ci.capi.land/teams/main/pipelines/capi/jobs/create-capi-release/builds/1531) which is untested
- this has previously led to issues where the capi version was failing
- this change will just use whatever is in cf-d as that is the capi that has been tested and passing

* Remove phrase edge capi

Co-authored-by: Al Berez <[email protected]>

---------

Co-authored-by: Al Berez <[email protected]>

Author: moleske

.github/workflows/tests-integration-reusable.yml

@@ -141,25 +141,19 @@ jobs:
         chmod +x $install_location/credhub
         credhub --version
 
-    - name: Deploy edge CAPI with Isolation Segment and OIDC Provider
+    - name: Deploy Isolation Segment and OIDC Provider
       if: ${{ inputs.capi-version == 'edge' }}
       env:
         CF_INT_CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
       run: |
-        # find latest capi
-        FILENAME="$(aws s3 ls capi-releases-app-runtime-interfaces --no-sign-request --recursive --region us-east-1 | sort | tail -n 1 | awk '{print $4}')"
-        aws s3 cp s3://capi-releases-app-runtime-interfaces/$FILENAME $FILENAME --no-sign-request --region us-east-1 --no-progress
         eval "$(bbl print-env --metadata-file metadata.json)"
-        bosh upload-release --sha2 "$FILENAME"
-        rm $FILENAME
 
         # deploy
         bosh -d cf manifest > /tmp/manifest.yml
         bosh interpolate /tmp/manifest.yml \
           -o cf-deployment/operations/add-persistent-isolation-segment-diego-cell.yml \
           -o cli-ci/ci/infrastructure/operations/add-oidc-provider.yml \
           -o cli-ci/ci/infrastructure/operations/add-uaa-client-credentials.yml \
-          -o cli-ci/ci/infrastructure/operations/use-latest-capi.yml \
           -o cli-ci/ci/infrastructure/operations/diego-cell-instances.yml \
           -v client-secret="${CF_INT_CLIENT_SECRET}" \
           > ./director.yml

.github/workflows/tests-integration.yml

@@ -11,26 +11,26 @@ on:
       - completed
 
 jobs: 
-  run-integration-tests-cf-env-with-edge-capi:
-    name: Integration tests with EDGE CAPI
+  run-integration-tests-cf-env:
+    name: Integration tests
     if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
     uses: ./.github/workflows/tests-integration-reusable.yml
     with:
       capi-version: edge
       run-with-client-creds: false
       os: ubuntu-latest
-      name: Integration EDGE CAPI
+      name: Integration
     secrets: inherit
 
-  run-integration-tests-cf-env-with-edge-capi-with-client-creds:
-    name: EDGE CAPI and client creds
+  run-integration-tests-cf-env-with-client-creds:
+    name: client creds
     if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
     uses: ./.github/workflows/tests-integration-reusable.yml
     with:
       capi-version: edge
       run-with-client-creds: true
       os: ubuntu-latest
-      name: Integration EDGE CAPI client creds
+      name: Integration client creds
     secrets: inherit
 
   run-integration-tests-cf-env-with-min-capi: