Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/TRI-1350 Update tavern tests to new aspects and testdataset #404

Merged
merged 7 commits into from
Jul 11, 2023
+125 −59
Merged

Feature/TRI-1350 Update tavern tests to new aspects and testdataset #404

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8f99e27
fix: Adjusted error message for incorrect globalAssetId syntax in tes…
ds-alexander-bulgakov Jul 6, 2023
debd36e
Merge branch 'main' into feature/TRI-1350-adjust-tavern-tests
ds-alexander-bulgakov Jul 6, 2023
34110f1
TRI-1350: changed aspects to "SerialPart" and "SingleLevelBomAsBuilt"…
ds-alexander-bulgakov Jul 7, 2023
5e0ab93
TRI-1350: Changed all globalAssetIds, adjusted tavern.yml to separate…
ds-alexander-bulgakov Jul 7, 2023
f13c0ef
TRI-1350: Several fixes and adjustments after first run analysis
ds-alexander-bulgakov Jul 7, 2023
f4cd203
TRI-1350: Changed env vars to all caps
ds-alexander-bulgakov Jul 10, 2023
d372e24
TRI-1350: added # back to bearer header
ds-alexander-bulgakov Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions .github/workflows/tavern.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,15 @@ on:
description: IRS-ESS environment to test
default: 'https://irs-ess.int.demo.catena-x.net'
required: true
global-asset-id:
global-asset-id-asPlanned:
type: string
description: Global Asset ID to use for the tests
default: 'urn:uuid:513d7be8-e7e4-49f4-a22b-8cd31317e454'
description: Global Asset ID to use for the asPlanned tests
default: 'urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4c79e'
required: true
global-asset-id-asBuild:
type: string
description: Global Asset ID to use for the asBuild tests
default: 'urn:uuid:7940e0cc-7814-41eb-8b04-d984a325deec'
required: true
execution-ticket:
type: string
Expand Down Expand Up @@ -54,7 +59,8 @@ jobs:
KEYCLOAK_HOST: ${{ secrets.KEYCLOAK_OAUTH2_CLIENT_TOKEN_URI }}
KEYCLOAK_CLIENT_ID: ${{ secrets.KEYCLOAK_OAUTH2_CLIENT_ID }}
KEYCLOAK_CLIENT_SECRET: ${{ secrets.KEYCLOAK_OAUTH2_CLIENT_SECRET }}
GLOBAL_ASSET_ID: ${{ github.event.inputs.global-asset-id || 'urn:uuid:513d7be8-e7e4-49f4-a22b-8cd31317e454' }}
GLOBAL_ASSET_ID_AsPlanned: ${{ github.event.inputs.global-asset-id-asPlanned || 'urn:uuid:0733946c-59c6-41ae-9570-cb43a6e4c79e' }}
GLOBAL_ASSET_ID_AsBuild: ${{ github.event.inputs.global-asset-id-asBuild || 'urn:uuid:7940e0cc-7814-41eb-8b04-d984a325deec' }}
ds-jhartmann marked this conversation as resolved.
Show resolved Hide resolved
run: |
python -m pytest local/testing/api-tests/irs-api-tests.tavern.yaml --junitxml=tavern-results.xml

Expand Down
2 changes: 1 addition & 1 deletion irs-load-tests/src/test/java/org/eclipse/tractusx/irs/IRSLoadTestSimulation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class IRSLoadTestSimulation extends Simulation {
.acceptHeader("*/*");

Map<CharSequence, String> headers_1 = new HashMap<>();
headers_1.put("Authorization", "Bearer #{access_token}");
headers_1.put("Authorization", "Bearer {access_token}");
ds-jhartmann marked this conversation as resolved.
Show resolved Hide resolved
headers_1.put("Content-Type", "application/json");

ScenarioBuilder scn = scenario("IRS Load Test")
Expand Down
Loading