Skip to content

Commit ad2c1ba

Browse files
authored
chore(e2e): Update desktop e2e test workflow to use new environment variable (#3014)
* chore(e2e): Update to use boundary license env * chore(e2e): Allow runs if workflow_dispatch
1 parent ea591df commit ad2c1ba

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

.github/workflows/test-e2e-desktop.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@ on:
77

88
jobs:
99
test:
10-
if: ${{contains(github.event.pull_request.labels.*.name, 'desktop')}}
10+
if: ${{ github.event_name == 'workflow_dispatch' || contains(github.event.pull_request.labels.*.name, 'desktop') }}
1111
name: Run Desktop E2E Tests
1212
runs-on: ${{ fromJSON(vars.RUNNER_UBUNTU_22) }}
1313
env:
1414
ENOS_VAR_boundary_edition: "ent"
1515
ENOS_VAR_e2e_debug_no_run: true
16-
ENOS_VAR_boundary_license_path: "./license.hclic"
1716
SETUP_CLI: true
1817
steps:
1918
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -72,15 +71,14 @@ jobs:
7271
docker pull hashicorp/boundary-enterprise:latest
7372
docker save hashicorp/boundary-enterprise:latest | gzip > /tmp/boundary-enterprise.zip
7473
75-
# TODO: Set up license in a better way? Use directly rather than writing to file and pull from secrets manager
7674
- name: Set up test infra
7775
id: infra
7876
run: |
79-
echo "${{ secrets.BOUNDARY_ENT_LICENSE }}" > ./support/src/boundary-enterprise/enos/license.hclic
8077
ssh-keygen -N '' -t ed25519 -f ~/.ssh/github_enos
8178
mkdir -p ./enos/terraform-plugin-cache
8279
export ENOS_VAR_enos_user=$GITHUB_ACTOR && \
8380
export ENOS_VAR_aws_ssh_private_key_path=~/.ssh/github_enos && \
81+
export ENOS_VAR_boundary_license="${{ secrets.BOUNDARY_ENT_LICENSE }}" && \
8482
export ENOS_VAR_boundary_docker_image_name=hashicorp/boundary-enterprise:latest && \
8583
export ENOS_VAR_boundary_docker_image_file=/tmp/boundary-enterprise.zip && \
8684
enos scenario launch --timeout 60m0s --chdir ./support/src/boundary-enterprise/enos e2e_ui_docker_ent builder:crt

0 commit comments

Comments
 (0)