Skip to content
Closed

Echovar #3702

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .github/workflows/create-bosh-lite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:

env_name="${{ steps.setup-bbl-env.outputs.envName }}"
cd $env_name/bbl-state
eval "$(bbl print-env)"
eval "$(bbl print-env --shell-type posix)"

jq -r .bosh.jumpbox_private_key metadata.json > /tmp/${env_name}.priv

Expand All @@ -131,7 +131,8 @@ jobs:
run: |
env_name="${{ steps.setup-bbl-env.outputs.envName }}"
cd $env_name/bbl-state
eval "$(bbl print-env)"
eval "$(bbl print-env --shell-type posix)"

bosh update-runtime-config ${GITHUB_WORKSPACE}/bosh-deployment/runtime-configs/dns.yml --name dns
STEMCELL_VERSION=$(bosh interpolate ${GITHUB_WORKSPACE}/cf-deployment/cf-deployment.yml --path /stemcells/alias=default/version)
bosh upload-stemcell "https://bosh.io/d/stemcells/bosh-warden-boshlite-ubuntu-jammy-go_agent?v=${STEMCELL_VERSION}"
Expand Down Expand Up @@ -162,10 +163,10 @@ jobs:
if: failure()
run: |
env_name="${{ steps.setup-bbl-env.outputs.envName }}"
if [ -d ${env_name}/bbl_state ]; then
if [ -d ${env_name}/bbl-state ]; then
cd ${env_name}/bbl-state
eval "$(bbl print-env)"
eval "$(bbl print-env --shell-type posix)"

echo "Deleting env ${env_name}"
bbl down --no-confirm --gcp-service-account-key=key.json

Expand All @@ -174,4 +175,4 @@ jobs:
gsutil rm -R gs://cf-cli-bosh-lites/${env_name}
fi
fi

6 changes: 4 additions & 2 deletions .github/workflows/delete-bosh-lite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,14 @@ jobs:
- name: delete bosh
run: |
cd ${ENV_NAME}/bbl-state
eval "$(bbl print-env)"
eval "$(bbl print-env --shell-type posix)"

echo $PSModulePath

echo "Deleting env ${ENV_NAME}"
echo ${BBL_GCP_SERVICE_ACCOUNT_KEY} > key.json
bbl down --no-confirm --gcp-service-account-key=key.json

- name: delete gcs bucket
run: |
gsutil rm -R gs://cf-cli-bosh-lites/${ENV_NAME}
gsutil rm -R gs://cf-cli-bosh-lites/${ENV_NAME}
4 changes: 2 additions & 2 deletions .github/workflows/tests-integration-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ jobs:
if: ${{ !inputs.run-with-client-creds }}
run: |
pushd ./${ENV_NAME}/bbl-state
eval "$(bbl print-env)"
eval "$(bbl print-env --shell-type posix)"
popd

cd cli
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
CF_INT_CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
run: |
pushd ./${ENV_NAME}/bbl-state
eval "$(bbl print-env)"
eval "$(bbl print-env --shell-type posix)"
popd

cd cli
Expand Down
Loading