From 5288fa15d41cccf74eada5acc99e4f09d1aa1f14 Mon Sep 17 00:00:00 2001
From: Vui Lam <vui.lam@broadcom.com>
Date: Wed, 4 Feb 2026 13:52:55 -0800
Subject: [PATCH] Fix bbl print-env producing output in wrong format

As a workaround, force the output in posix format using the --shell-type
argument.

Partially-fixes: #3698
---
 .github/workflows/create-bosh-lite.yml           | 13 +++++++------
 .github/workflows/delete-bosh-lite.yml           |  2 +-
 .github/workflows/tests-integration-reusable.yml |  4 ++--
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/create-bosh-lite.yml b/.github/workflows/create-bosh-lite.yml
index be96897dcd..ad91ccb4a8 100644
--- a/.github/workflows/create-bosh-lite.yml
+++ b/.github/workflows/create-bosh-lite.yml
@@ -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
 
@@ -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}"
@@ -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
 
@@ -174,4 +175,4 @@ jobs:
               gsutil rm -R gs://cf-cli-bosh-lites/${env_name} 
             fi
           fi
-          
\ No newline at end of file
+
diff --git a/.github/workflows/delete-bosh-lite.yml b/.github/workflows/delete-bosh-lite.yml
index 72fc433ef9..532a2ae2fc 100644
--- a/.github/workflows/delete-bosh-lite.yml
+++ b/.github/workflows/delete-bosh-lite.yml
@@ -71,7 +71,7 @@ jobs:
       - name: delete bosh
         run: |
           cd ${ENV_NAME}/bbl-state
-          eval "$(bbl print-env)"
+          eval "$(bbl print-env --shell-type posix)"
           
           echo "Deleting env ${ENV_NAME}"
           echo ${BBL_GCP_SERVICE_ACCOUNT_KEY} > key.json
diff --git a/.github/workflows/tests-integration-reusable.yml b/.github/workflows/tests-integration-reusable.yml
index 6f82c54cdb..fc8149c951 100644
--- a/.github/workflows/tests-integration-reusable.yml
+++ b/.github/workflows/tests-integration-reusable.yml
@@ -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
@@ -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