Use bosh lite env (#32)

gururajsh · web-flow · commit c567e2c3e938 · 2025-07-08T11:54:40.000-04:00
diff --git a/.github/workflows/create-bosh-release.yml b/.github/workflows/create-bosh-release.yml
@@ -19,7 +19,9 @@ env:
   BOSH_DEPLOYMENT:      cf-cli-test
   BOSH_NON_INTERACTIVE: true
   PAGER:                cat
-
+  BBL_IAAS: gcp
+  BBL_GCP_REGION: us-east1
+  BBL_GCP_SERVICE_ACCOUNT_KEY: ${{ secrets.GCP_CREDENTIALS_JSON }}
 jobs:
   create_bosh_release:
     name: Create Bosh Release
@@ -38,6 +40,7 @@ jobs:
         ./ci/scripts/download-cf-cli-binary.sh --major-version 8 --output-dir ./build/cf-cli-binaries
 
     - name: Overwrite config/final.yml with the destination bucket
+      if:   ${{ vars.PRODUCTION == 'true' }}
       run: |
        cat << EOF > config/final.yml
        name: cf-cli
@@ -87,68 +90,60 @@ jobs:
         branch:        ${{ format('{0}{1}', github.ref, vars.BRANCH_SUFFIX) }}
         github_token:  ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Create test environment
-      id:   create-env
-      if: ${{ !(vars.ENV_ID || vars.SKIP_TESTS == 'true') }}
-      uses: pivotal-cf/gha-shepherd@latest
-      with:
-        api_endpoint:    ${{ secrets.SHEPHERD_API_ENDPOINT }}
-        api_token:       ${{ secrets.SHEPHERD_API_TOKEN }}
-        command:         create
-        debug:           ${{ runner.debug }}
-        duration:        1h
-        namespace:       tas-devex
-        pool_name:       cfd
-        pool_namespace:  official
-
-    - name: Get running env metadata
-      if: ${{ vars.SKIP_TESTS != 'true' }}
-      uses: pivotal-cf/gha-shepherd@latest
-      with:
-        api_endpoint:   ${{ secrets.SHEPHERD_API_ENDPOINT }}
-        api_token:      ${{ secrets.SHEPHERD_API_TOKEN }}
-        command:        get
-        debug:          ${{ runner.debug }}
-        env_file_path:  lease.json
-        env_id:         ${{ vars.ENV_ID || steps.create-env.outputs.env-id }}
-        namespace:      tas-devex
-
-    - name: Store lease data
-      if: ${{ vars.SKIP_TESTS != 'true' }}
-      uses: actions/upload-artifact@v4
+    - name: Checkout bosh-bootloader
+      uses: actions/checkout@v4
       with:
-        name: lease-json
-        path: lease.json
+        repository: cloudfoundry/bosh-bootloader
+        path: bosh-bootloader
 
-    - name: Deploy and run tests
-      if: ${{ vars.SKIP_TESTS != 'true' }}
+    - name: Setup bbl
+      id: setup-bbl-env
       run: |
-        rm lease.json
-
-    # use previous lease data to reuse leased environment
-    - name: Retrieve lease data
-      if: ${{ vars.SKIP_TESTS != 'true' }}
-      uses: actions/download-artifact@v4
-      with:
-        name: lease-json
+        env_name="$(grep '^.\{1,4\}$' /usr/share/dict/words |
+        shuf -n1 |
+        tr -dc '[:alnum:]\n\r' |
+        tr '[:upper:]' '[:lower:]')"
+
+        if [ ! -z "${env_name}" ]; then
+          env_name=cli-bosh-rel-${env_name}
+          mkdir -p $env_name/bbl-state
+        fi
+        echo "Bbl environment name: $env_name"
+        echo "envName=$env_name" >> $GITHUB_OUTPUT
 
-    - name: Deploy and run tests
-      if: ${{ vars.SKIP_TESTS != 'true' }}
+    - name: Create bbl env
+      id: create-env
       run: |
-        setup_bosh_environment() {
+        env_name=${{ steps.setup-bbl-env.outputs.envName }}
+        cd $env_name/bbl-state
 
-          jq -r .output lease.json > metadata.json
+        cp -R ${GITHUB_WORKSPACE}/bosh-bootloader/plan-patches/bosh-lite-gcp/* .
+        bbl plan --name $env_name
+        bbl up
+        eval "$(bbl print-env)"
+        bosh upload-stemcell "https://bosh.io/d/stemcells/bosh-warden-boshlite-ubuntu-jammy-go_agent?v=${{ vars.STEMCELL_VERSION }}"
 
-          env_name=$(jq -r .name metadata.json)
-          jq -r .bosh.jumpbox_private_key metadata.json > /tmp/${env_name}.priv
-          eval "$(bbl print-env --metadata-file metadata.json)"
+    - name: Authenticate to Google Cloud
+      uses: google-github-actions/auth@v2
+      with:
+        credentials_json: ${{ secrets.GCP_CREDENTIALS_JSON }}
+
+    - name: Setup gcloud CLI
+      uses: google-github-actions/setup-gcloud@v1
 
-        }
+    - name: Save bbl state
+      run: |
+        env_name=${{ steps.setup-bbl-env.outputs.envName }}
+        gsutil -m cp -P -R ./$env_name gs://cf-cli-bosh-lites/    
 
-        setup_bosh_environment
+    - name: Deploy and run tests
+      if: ${{ vars.SKIP_TESTS != 'true' }}
+      run: |
+        env_name=${{ steps.setup-bbl-env.outputs.envName }}
 
-        bosh delete-deployment --force
-        bosh deployments
+        pushd $env_name/bbl-state
+          eval "$(bbl print-env)"
+        popd
 
         echo "::group::Bosh deploy"
         bosh deploy ./manifests/test.yml
@@ -161,21 +156,7 @@ jobs:
 
         bosh delete-deployment
         bosh clean-up --all
-
-    - name: Upload artifacts with test results
-      if: ${{ vars.SKIP_TESTS != 'true' }}
-      uses: actions/upload-artifact@v4
-      with:
-        name: test-results
-        path: /tmp/cf-cli-*-test.out
-    
-    - name: Retrieve test results
-      if: ${{ vars.SKIP_TESTS != 'true' }}
-      uses: actions/download-artifact@v4
-      with:
-        name: test-results
-        path: /tmp
-
+        
     - name: Verify test results
       if: ${{ vars.SKIP_TESTS != 'true' }}
       run: |
@@ -308,13 +289,11 @@ jobs:
         files: |
           ./cf-cli-v${{ steps.generate-next-release-version.outputs.version }}.tgz
 
-    - name: Delete lease with provided env_id and namespace
+    - name: Delete env
       if:   ${{ always() && !vars.ENV_ID && steps.create-env.outcome == 'success' && !runner.debug }}
-      uses: pivotal-cf/gha-shepherd@latest
-      with:
-        api_endpoint: ${{ secrets.SHEPHERD_API_ENDPOINT }}
-        api_token:    ${{ secrets.SHEPHERD_API_TOKEN }}
-        command:      delete
-        debug:        ${{ runner.debug }}
-        env_id:       ${{ steps.create-env.outputs.env-id }}
-        namespace:    tas-devex
+      run: |
+        env_name=${{ steps.setup-bbl-env.outputs.envName }}
+        cd $env_name/bbl-state
+        bbl destroy --no-confirm
+        rm -rf $env_name
+        gsutil rm -R gs://cf-cli-bosh-lites/$env_name
diff --git a/ci/Dockerfile b/ci/Dockerfile
@@ -1,9 +1,10 @@
 FROM summerwind/actions-runner:latest
 
-ENV bbl_version 8.4.111
-ENV bosh_cli_version 7.2.3
+ENV bbl_version 9.0.35
+ENV bosh_cli_version 7.7.2
 ENV NODE_VERSION 22.2.0
-ENV terraform_version 0.11.5
+ENV terraform_version 1.12.2
+ENV credhub_version 2.9.45
 
 USER root
 RUN usermod -a -G sudo root
@@ -14,6 +15,8 @@ RUN \
   apt-get update && \
   apt-get -y install \
     shellcheck \
+    ruby-full \
+    wamerican \
     yamllint && \
   apt list --installed
 
@@ -68,7 +71,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
 
 # bosh-cli
 RUN \
-  wget --no-verbose https://s3.amazonaws.com/bosh-cli-artifacts/bosh-cli-${bosh_cli_version}-linux-amd64 --output-document="/usr/local/bin/bosh" && \
+  curl https://github.com/cloudfoundry/bosh-cli/releases/download/v${bosh_cli_version}/bosh-cli-${bosh_cli_version}-linux-amd64 --silent --output /usr/local/bin/bosh --location && \
   chmod +x /usr/local/bin/bosh
 
 # bbl and dependencies
@@ -93,3 +96,8 @@ RUN \
   cd /usr/local/bin && \
   chmod +x terraform && \
   rm -rf /tmp/*
+
+RUN \
+  curl https://github.com/cloudfoundry/credhub-cli/releases/download/${credhub_version}/credhub-linux-amd64-${credhub_version}.tgz --silent --location --output /tmp/credhub.tgz && \
+  tar -xzf /tmp/credhub.tgz -C /usr/local/bin && \
+  chmod +x /usr/local/bin/credhub 
diff --git a/manifests/test.yml b/manifests/test.yml
@@ -29,7 +29,7 @@ instance_groups:
   - name: cf-cli-8-linux-test
     release: cf-cli
     properties: {}
-  vm_type: default
+  vm_type: minimal
   stemcell: default
   networks:
   - name: default
