From 54af0943f211d7d8230674cf055ce0511edf55a7 Mon Sep 17 00:00:00 2001 From: Al Berez Date: Thu, 17 Oct 2024 20:29:01 -0700 Subject: [PATCH] Do not apply ops files to the existing lease --- .github/workflows/tests-integration.yml | 37 ++++++++----------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/.github/workflows/tests-integration.yml b/.github/workflows/tests-integration.yml index 0a1a759897..028412dc2e 100644 --- a/.github/workflows/tests-integration.yml +++ b/.github/workflows/tests-integration.yml @@ -43,20 +43,6 @@ env: jobs: - playground: - runs-on: ubuntu-latest - steps: - - run: | - echo Hi - echo $SHEPHERD_LEASE_ID - - if [[ -z $SHEPHERD_LEASE_ID ]]; then - echo "true is empty $SHEPHERD_LEASE_ID " - else - echo "false $SHEPHERD_LEASE_ID " - fi - - get-sha: runs-on: ubuntu-latest outputs: @@ -230,19 +216,18 @@ jobs: jq -r .bosh.jumpbox_private_key metadata.json > /tmp/${env_name}.priv eval "$(bbl print-env --metadata-file metadata.json)" - # deploy - bosh -d cf manifest > /tmp/manifest.yml - bosh interpolate /tmp/manifest.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 \ - -o .github/ops-files/add-oidc-provider.yml \ - -o .github/ops-files/add-uaa-client-credentials.yml \ - -o .github/ops-files/diego-cell-instances.yml \ - -v client-secret="${{ secrets.CLIENT_SECRET }}" \ - > ./director.yml - if [[ -z $SHEPHERD_LEASE_ID ]]; then + bosh -d cf manifest > /tmp/manifest.yml + bosh interpolate /tmp/manifest.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 \ + -o .github/ops-files/add-oidc-provider.yml \ + -o .github/ops-files/add-uaa-client-credentials.yml \ + -o .github/ops-files/diego-cell-instances.yml \ + -v client-secret="${{ secrets.CLIENT_SECRET }}" \ + > ./director.yml + bosh -d cf deploy director.yml -n fi echo "Deployed CAPI version:"