Skip to content

Commit

Permalink
Merge pull request #165 from JupiterOne/SRE-1723
Browse files Browse the repository at this point in the history
SRE-1723
  • Loading branch information
jablonnc authored Feb 20, 2024
2 parents efd8e9e + 379e623 commit f404534
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .github/actions/frontend/runtime/e2e_prepare/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,8 @@ runs:
echo "artemis_account_subdomain=$(jq -r .[0].metadata.accountSubdomain < artemis-run.json)" >> $GITHUB_OUTPUT
echo "artemis_account_id=$(jq -r .[0].id < artemis-run.json)" >> $GITHUB_OUTPUT
echo "artemis_users=$(jq -c 'map((select(. | .type == "User")) | { tokenSecret: .metadata.token.tokenSecret, tokenCsrf: .metadata.token.tokenCsrf, groupName: .metadata.groupName })' < artemis-run.json)" >> $GITHUB_OUTPUT
- uses: actions/upload-artifact@v4
name: upload_artemis_run
with:
name: artemis-run
path: artemis-run.json
1 change: 1 addition & 0 deletions .github/actions/frontend/runtime/e2e_prepare/mocks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ export const E2E_PREPARE_MOCK_STEPS = [
{ name: 'configure_aws_credentials' },
{ name: 'update_artemis_config' },
{ name: 'launch_artemis' },
{ name: 'upload_artemis_run' }
];
4 changes: 4 additions & 0 deletions .github/actions/frontend/runtime/e2e_run/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@ runs:
shell: bash
run:
echo "commit_info_author=$(git show -s --pretty=%an)" >> $GITHUB_OUTPUT
- name: download_artemis_run
uses: actions/download-artifact@v4
with:
name: artemis-run
- name: cypress_run
id: cypress_run
continue-on-error: ${{ fromJSON(inputs.e2e_pass_on_error) }}
Expand Down
1 change: 1 addition & 0 deletions .github/actions/frontend/runtime/e2e_run/mocks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ mocked, they would break the test.
export const E2E_RUN_MOCK_STEPS = [
{ name: 'get_author_name' },
{ name: 'cypress_run' },
{ name: 'download_artemis_run' },
];

0 comments on commit f404534

Please sign in to comment.