-
Notifications
You must be signed in to change notification settings - Fork 24
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
Merge to Main for 4.1.0 release #377
Merged
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
1cf1b14
Merge pull request #358 from adobe/main
emdobrin e475087
Set parent ID to Edge response events (resolves #327) (#361)
kevinlind b2eabc0
Get 'eventIndex' from 'report' object for interact response errors an…
kevinlind a2d61de
Updating version to 4.1.0.
kevinlind 8a2b1e7
Merge pull request #366 from adobe/version-4.1.0-update
kevinlind f114e14
[CI] Run unit and functional tests separately in CI (#368)
timkimadobe b43e2c8
Sleep after EventHub.shared.start in API unit tests
kevinlind bde2acf
Merge pull request #369 from kevinlind/fix-api-unit-test
kevinlind 2bf8b01
Wait for sendEvent to return before continuing functional test. (#370)
kevinlind 4794f82
Use 'large' resource class when running tests in CI (#371)
kevinlind d12142f
Merge pull request #372 from adobe/dev
kevinlind fb725be
Pod Update Podfile for AEPEdge 4.1.0
kevinlind 0eec6f1
Merge pull request #374 from kevinlind/update-podfile
kevinlind a006885
Feature/upstream integration tests (#373)
timkimadobe fe77180
Merge pull request #376 from adobe/dev
emdobrin File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| # Action to execute upstream integration tests - Edge Network (Konductor) | ||
| name: Integration Tests | ||
|
|
||
| # Controls when the action will run. Workflow runs when manually triggered using the UI | ||
| # or API. | ||
| on: | ||
| workflow_dispatch: | ||
| inputs: | ||
| branch: | ||
| description: 'Branch to use when running integration tests' | ||
| required: false | ||
| default: 'main' | ||
| id: | ||
| description: 'Identifier for the run (optional)' | ||
| required: false | ||
| environment: | ||
| type: choice | ||
| description: 'Edge Network environment to test' | ||
| required: true | ||
| default: 'prod' | ||
| options: | ||
| - prod | ||
| - pre-prod | ||
| - int | ||
| edge-location-hint: | ||
| type: choice | ||
| description: 'Edge location hint to set before each test (optional)' | ||
| required: false | ||
| default: '' | ||
| options: | ||
| - '' # Interpreted in the test code as no preset location hint; any non-valid location hint string is interpreted this way | ||
| - 'or2' | ||
| - 'va6' | ||
| - 'irl1' | ||
| - 'ind1' | ||
| - 'jpn3' | ||
| - 'sgp3' | ||
| - 'aus3' | ||
|
|
||
| # A workflow run is made up of one or more jobs that can run sequentially or in parallel | ||
| jobs: | ||
| test-integration-upstream: | ||
| # The type of runner that the job will run on | ||
| runs-on: macos-latest | ||
|
|
||
| # Steps represent a sequence of tasks that will be executed as part of the job | ||
| steps: | ||
|
|
||
| - name: Job run identifier ${{ github.event.inputs.id }} | ||
| run: | | ||
| if [ -z "${{ github.event.inputs.id }}" ]; then \ | ||
| echo No job run identifier was set. | ||
| else | ||
| echo 'Job run identifier is:' ${{ inputs.id }} | ||
| fi; | ||
|
|
||
| - name: Checkout | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| ref: ${{ github.event.inputs.branch }} | ||
|
|
||
| - name: Cache Cocoapods | ||
| uses: actions/cache@v3 | ||
| with: | ||
| path: Pods | ||
| key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-pods- | ||
|
|
||
| # Runs a single command using the runners shell | ||
| - name: Execute Edge Network integration tests | ||
| run: make test-integration-upstream EDGE_ENVIRONMENT=${{ github.event.inputs.environment }} EDGE_LOCATION_HINT=${{ github.event.inputs.edge-location-hint }} | ||
|
|
||
| # Potential workflow solutions on job failure | ||
| - name: On failure | ||
| if: ${{ failure() }} | ||
| run: | | ||
| echo 'Job used branch: ' ${{ github.event.inputs.branch }}. Please make sure this is the branch to run off of. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this not needed for integration tests?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the coverage of integration tests overlaps with functional tests; do we want to upload the integration test coverage as well?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Currently the integration tests are passing using the default medium resource class. My guess is since they use actual network calls the sequence of events execute more slowly and they don't experience the timeout issues in the functional tests. As the tests are passing, and running on an x86 chipset, there's no need to install Rosetta.