Skip to content

Commit a96f02c

Browse files
authored
Fix bbl print-env producing output in wrong format (#3701)
As a workaround, force the output in posix format using the --shell-type argument. Partially-fixes: #3698
1 parent d41880a commit a96f02c

3 files changed

Lines changed: 10 additions & 9 deletions

File tree

.github/workflows/create-bosh-lite.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
123123
env_name="${{ steps.setup-bbl-env.outputs.envName }}"
124124
cd $env_name/bbl-state
125-
eval "$(bbl print-env)"
125+
eval "$(bbl print-env --shell-type posix)"
126126
127127
jq -r .bosh.jumpbox_private_key metadata.json > /tmp/${env_name}.priv
128128
@@ -131,7 +131,8 @@ jobs:
131131
run: |
132132
env_name="${{ steps.setup-bbl-env.outputs.envName }}"
133133
cd $env_name/bbl-state
134-
eval "$(bbl print-env)"
134+
eval "$(bbl print-env --shell-type posix)"
135+
135136
bosh update-runtime-config ${GITHUB_WORKSPACE}/bosh-deployment/runtime-configs/dns.yml --name dns
136137
STEMCELL_VERSION=$(bosh interpolate ${GITHUB_WORKSPACE}/cf-deployment/cf-deployment.yml --path /stemcells/alias=default/version)
137138
bosh upload-stemcell "https://bosh.io/d/stemcells/bosh-warden-boshlite-ubuntu-jammy-go_agent?v=${STEMCELL_VERSION}"
@@ -162,10 +163,10 @@ jobs:
162163
if: failure()
163164
run: |
164165
env_name="${{ steps.setup-bbl-env.outputs.envName }}"
165-
if [ -d ${env_name}/bbl_state ]; then
166+
if [ -d ${env_name}/bbl-state ]; then
166167
cd ${env_name}/bbl-state
167-
eval "$(bbl print-env)"
168-
168+
eval "$(bbl print-env --shell-type posix)"
169+
169170
echo "Deleting env ${env_name}"
170171
bbl down --no-confirm --gcp-service-account-key=key.json
171172
@@ -174,4 +175,4 @@ jobs:
174175
gsutil rm -R gs://cf-cli-bosh-lites/${env_name}
175176
fi
176177
fi
177-
178+

.github/workflows/delete-bosh-lite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
- name: delete bosh
7272
run: |
7373
cd ${ENV_NAME}/bbl-state
74-
eval "$(bbl print-env)"
74+
eval "$(bbl print-env --shell-type posix)"
7575
7676
echo "Deleting env ${ENV_NAME}"
7777
echo ${BBL_GCP_SERVICE_ACCOUNT_KEY} > key.json

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ jobs:
8888
if: ${{ !inputs.run-with-client-creds }}
8989
run: |
9090
pushd ./${ENV_NAME}/bbl-state
91-
eval "$(bbl print-env)"
91+
eval "$(bbl print-env --shell-type posix)"
9292
popd
9393
9494
cd cli
@@ -119,7 +119,7 @@ jobs:
119119
CF_INT_CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }}
120120
run: |
121121
pushd ./${ENV_NAME}/bbl-state
122-
eval "$(bbl print-env)"
122+
eval "$(bbl print-env --shell-type posix)"
123123
popd
124124
125125
cd cli

0 commit comments

Comments
 (0)