From 5ea4300ad7a8de21bbae1fab8eecc7124b4e09d9 Mon Sep 17 00:00:00 2001 From: Al Berez Date: Tue, 25 Mar 2025 10:10:33 -0700 Subject: [PATCH] Pass additional opsfiles to the shepherd This opsfiles are applied during the lease creation --- .github/workflows/tests-integration.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests-integration.yml b/.github/workflows/tests-integration.yml index 653065422de..c1e8377ecaa 100644 --- a/.github/workflows/tests-integration.yml +++ b/.github/workflows/tests-integration.yml @@ -130,16 +130,17 @@ jobs: with: ref: ${{needs.get-sha.outputs.gitRef}} - - name: claim + - name: Claim Environment id: claim env: - account_token: ${{ secrets.SHEPHERD_SERVICE_ACCOUNT_TOKEN }} - template_argument: ${{ vars.SHEPHERD_TEMPLATE_ARGUMENT }} - template_name: ${{ vars.SHEPHERD_TEMPLATE_NAME || 'cfd-bosh-lite@1.0' }} - template_namespace: ${{ vars.SHEPHERD_TEMPLATE_NAMESPACE || 'official' }} - lease_duration: ${{ vars.SHEPHERD_LEASE_DURATION || '8h' }} - lease_namespace: ${{ inputs.lease_namespace || vars.SHEPHERD_LEASE_NAMESPACE || 'tas-devex' }} - cfd_version: ${{ inputs.cfd_version || vars.CFD_VERSION || '' }} + account_token: ${{ secrets.SHEPHERD_SERVICE_ACCOUNT_TOKEN }} + template_argument: ${{ vars.SHEPHERD_TEMPLATE_ARGUMENT }} + template_name: ${{ vars.SHEPHERD_TEMPLATE_NAME || 'cfd-bosh-lite@1.0' }} + template_namespace: ${{ vars.SHEPHERD_TEMPLATE_NAMESPACE || 'official' }} + lease_duration: ${{ vars.SHEPHERD_LEASE_DURATION || '8h' }} + additional_opsfiles_b64: ${{ vars.SHEPHERD_ADDITIONAL_OPSFILES_B64 || '' }} + lease_namespace: ${{ inputs.lease_namespace || vars.SHEPHERD_LEASE_NAMESPACE || 'tas-devex' }} + cfd_version: ${{ inputs.cfd_version || vars.CFD_VERSION || '' }} run: | shepherd login service-account ${account_token} @@ -153,7 +154,7 @@ jobs: "root_disk_gb": 32, "disk_pool_gb": 150, "cfd_version": "${cfd_version}", - "additional_opsfiles_b64": "" + "additional_opsfiles_b64": "${additional_opsfiles_b64}" } EOF )