Merge branch 'main' into dependabot/go_modules/dependencies-4fd8f4187f

cloudfoundry · Jan 29, 2025 · 5125230 · 5125230
2 parents ada4f07 + 9249609
commit 5125230
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/.github/workflows/tests-integration.yml b/.github/workflows/tests-integration.yml
@@ -262,6 +262,14 @@ jobs:
           path: cf-deployment
           ref: ${{steps.claim.outputs.cf_deployment_version}}    
 
+      - name: Checkout cf-deployment-main
+        if: ${{ (inputs.lease_id == '') || (inputs.reinstall_cfd == true) }}
+        uses: actions/checkout@v4
+        with:
+          repository: cloudfoundry/cf-deployment
+          path: cf-deployment-main
+          ref: main          
+
       - name: Deploy Isolation Segment and OIDC Provider
         if: ${{ (inputs.lease_id == '') || (inputs.reinstall_cfd == true) }}
         run: |
@@ -271,7 +279,7 @@ jobs:
 
           bosh -d cf manifest > /tmp/manifest.yml
           bosh interpolate /tmp/manifest.yml \
-            -o cf-deployment/operations/enable-v2-api.yml \
+            -o cf-deployment-main/operations/enable-v2-api.yml \
             -o cf-deployment/operations/use-internal-lookup-for-route-services.yml \
             -o cf-deployment/operations/add-persistent-isolation-segment-diego-cell.yml \
             -o .github/ops-files/use-latest-capi.yml \