Skip to content

Commit

Permalink
APP-14422: Revert artemis_full_output changes to get e2e pipelines ba…
Browse files Browse the repository at this point in the history
…ck up.
  • Loading branch information
bjoepfeiffer committed Feb 7, 2024
1 parent 3417fb0 commit b832a0f
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 31 deletions.
2 changes: 0 additions & 2 deletions .github/actions/frontend/runtime/e2e_prepare/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ This action returns the following outputs:
| `artemis_account_subdomain` | String | The account subdomain extracted from the artemis-run.json file |
| `artemis_account_id` | String | The id extracted from the artemis-run.json file |
| `artemis_users` | String | The users extracted from the artemis-run.json file |
| `artemis_full_output` | String | The full output of the artemis-run.json file |

## Example Usage

Expand All @@ -40,6 +39,5 @@ steps:
echo ${{ steps.e2e_prepare.outputs.artemis_account_subdomain }}
echo ${{ steps.e2e_prepare.outputs.artemis_account_id }}
echo ${{ steps.e2e_prepare.outputs.artemis_users }}
echo ${{ steps.e2e_prepare.outputs.artemis_full_output }}
shell: bash
```
3 changes: 0 additions & 3 deletions .github/actions/frontend/runtime/e2e_prepare/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ outputs:
value: ${{ steps.artemis_info.outputs.artemis_account_id }}
artemis_users:
value: ${{ steps.artemis_info.outputs.artemis_users }}
artemis_full_output:
value: ${{ steps.artemis_info.outputs.artemis_full_output }}

runs:
using: 'composite'
Expand Down Expand Up @@ -55,4 +53,3 @@ 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
echo "artemis_full_output=$(jq -c . < artemis-run.json)" >> $GITHUB_OUTPUT
10 changes: 0 additions & 10 deletions .github/actions/frontend/runtime/e2e_prepare/test/action.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,6 @@ test('output of artemis_info returns correct results based off artemis-run.json'
results,
name: 'results_artemis_users',
});
const results_artemis_full_output = getTestResult({
results,
name: 'results_artemis_full_output',
});

expect(results_artemis_account_name.output).toEqual(
artemisRun[0].metadata.accountName
Expand All @@ -77,10 +73,4 @@ test('output of artemis_info returns correct results based off artemis-run.json'
expect(results_artemis_users.output).toContain(
artemisRun[1].metadata.groupName
);
expect(results_artemis_full_output.output).toContain(
artemisRun[0].metadata.accountName
);
expect(results_artemis_full_output.output).toContain(
artemisRun[1].metadata.token.tokenSecret
);
});
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,3 @@ jobs:
- name: results_artemis_users
run: echo ${{ steps.e2e_prepare.outputs.artemis_users }}
shell: bash
- name: results_artemis_full_output
run: echo ${{ steps.e2e_prepare.outputs.artemis_full_output }}
shell: bash
2 changes: 0 additions & 2 deletions .github/actions/frontend/runtime/e2e_run/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ This action takes the following inputs:
| `artemis_account_subdomain` | String | | True | The account subdomain extracted from the artemis-run.json file |
| `artemis_account_id` | String | | True | The id extracted from the artemis-run.json file |
| `artemis_users` | String | | True | The users extracted from the artemis-run.json file |
| `artemis_full_output` | String | | True | The full output of the artemis-run.json file |
| `commit_info_sha` | String | github.sha | True | The sha associated with the PR that triggered the e2e_run |
| `commit_info_pr_number` | String | github.event.pull_request.number | True | The PR number associated with the PR that triggered the e2e_run |
| `commit_info_pr_title` | String | github.event.pull_request.title | True | The PR title associated with the PR that triggered the e2e_run |
Expand Down Expand Up @@ -54,7 +53,6 @@ steps:
artemis_account_subdomain:
${{ needs.e2e_prepare.outputs.artemis_account_subdomain }}
artemis_users: ${{ needs.e2e_prepare.outputs.artemis_users }}
artemis_full_output: ${{ needs.e2e_prepare.outputs.artemis_full_output }}
cypress_container: ${{ matrix.containers }}
cypress_tag: ${{ github.event.repository.name }},${{ github.event_name }}
cypress_mailinator_api_key: ${{ secrets.CYPRESS_MAILINATOR_API_KEY }}
Expand Down
6 changes: 0 additions & 6 deletions .github/actions/frontend/runtime/e2e_run/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ inputs:
description: 'The users extracted from the artemis-run.json file'
type: string
required: true
artemis_full_output:
description: 'The full output of the artemis-run.json file'
type: string
required: true
commit_info_sha:
description:
'The commit sha associated with the repo that triggered the e2e_run'
Expand Down Expand Up @@ -114,7 +110,6 @@ runs:
echo "artemis_account_id=${{ inputs.artemis_account_id }}"
echo "artemis_account_subdomain=${{ inputs.artemis_account_subdomain }}"
echo "artemis_users=${{ inputs.artemis_users }}"
echo "artemis_full_output=${{ inputs.artemis_full_output }}"
echo "commit_info_sha=${{ inputs.commit_info_sha }}"
echo "commit_info_pr_number=${{ inputs.commit_info_pr_number }}"
echo "commit_info_pr_title=${{ inputs.commit_info_pr_title }}"
Expand Down Expand Up @@ -169,7 +164,6 @@ runs:
CYPRESS_PROJECT_ID: ${{ inputs.cypress_project_id }}
CYPRESS_PASSWORD: ${{ inputs.cypress_password }}
CYPRESS_ENVIRONMENT_NAME: jupiterone-dev
CYPRESS_ARTEMIS_OUTPUT: ${{ inputs.artemis_full_output }}
GITHUB_TOKEN: ${{ inputs.github_token }}
MIGRATION_NUMBER: ${{ inputs.migration_number }}
PR_NUMBER: ${{ inputs.commit_info_pr_number }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ jobs:
artemis_account_subdomain:
${{ steps.e2e_prepare.outputs.artemis_account_subdomain }}
artemis_users: ${{ steps.e2e_prepare.outputs.artemis_users }}
artemis_full_output: ${{ steps.e2e_prepare.outputs.artemis_full_output }}
steps:
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -229,8 +228,6 @@ jobs:
artemis_account_subdomain:
${{ needs.e2e_prepare.outputs.artemis_account_subdomain }}
artemis_users: ${{ needs.e2e_prepare.outputs.artemis_users }}
artemis_full_output:
${{ needs.e2e_prepare.outputs.artemis_full_output }}
cypress_container: ${{ matrix.containers }}
cypress_mailinator_api_key: ${{ secrets.CYPRESS_MAILINATOR_API_KEY }}
cypress_record_key: ${{ secrets.CYPRESS_RECORD_KEY }}
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/frontend_runtime_e2e_trigger_response.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,6 @@ jobs:
artemis_account_subdomain:
${{ needs.e2e_prepare.outputs.artemis_account_subdomain }}
artemis_users: ${{ needs.e2e_prepare.outputs.artemis_users }}
artemis_full_output:
${{ needs.e2e_prepare.outputs.artemis_full_output }}
cypress_record_key: ${{ secrets.CYPRESS_RECORD_KEY }}
cypress_project_id: ${{ secrets.CYPRESS_PROJECT_ID }}
cypress_password: ${{ secrets.CYPRESS_PASSWORD }}
Expand Down

0 comments on commit b832a0f

Please sign in to comment.