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.

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

[Backport 1.x] Add integration test framework #796

Merged
merged 6 commits into from
Jun 7, 2023

Conversation

opensearch-trigger-bot[bot]
Copy link

Backport 04d9eab from #687.

* Add integration test task that uses the OpenSearch gradle plugin

Signed-off-by: Ryan Bogan <[email protected]>

* Added closeTestExtension task to kill testExtension process

Signed-off-by: Ryan Bogan <[email protected]>

* Fix spotless

Signed-off-by: Ryan Bogan <[email protected]>

* Implement resolution strategy to fix dependency conflict

Signed-off-by: Ryan Bogan <[email protected]>

* Minor adjustment

Signed-off-by: Ryan Bogan <[email protected]>

* Change jackson version

Signed-off-by: Ryan Bogan <[email protected]>

* Change jackson dataformat version

Signed-off-by: Ryan Bogan <[email protected]>

* Revert jackson version change

Signed-off-by: Ryan Bogan <[email protected]>

* Add resolution strategy to fix jackson dependency conflict

Signed-off-by: Ryan Bogan <[email protected]>

* Address PR Comments

Signed-off-by: Ryan Bogan <[email protected]>

* Add new implementation to fix error from separate merge

Signed-off-by: Ryan Bogan <[email protected]>

* Address PR Comments

Signed-off-by: Ryan Bogan <[email protected]>

* Address PR Comments

Signed-off-by: Ryan Bogan <[email protected]>

* Revert minor change

Signed-off-by: Ryan Bogan <[email protected]>

* Address PR Comments

Signed-off-by: Ryan Bogan <[email protected]>

* Add reading from yaml for testExtensionCreation

Signed-off-by: Ryan Bogan <[email protected]>

* Spotless

Signed-off-by: Ryan Bogan <[email protected]>

* Minor change

Signed-off-by: Ryan Bogan <[email protected]>

* Debug test commit

Signed-off-by: Ryan Bogan <[email protected]>

* Minor changes

Signed-off-by: Ryan Bogan <[email protected]>

* Remove extra test class

Signed-off-by: Ryan Bogan <[email protected]>

* Add index

Signed-off-by: Ryan Bogan <[email protected]>

* Fix inadvertent change

Signed-off-by: Ryan Bogan <[email protected]>

* Minor change

Signed-off-by: Ryan Bogan <[email protected]>

* Add log4j resolution strategy

Signed-off-by: Ryan Bogan <[email protected]>

* Remove testing println

Signed-off-by: Ryan Bogan <[email protected]>

---------

Signed-off-by: Ryan Bogan <[email protected]>
Co-authored-by: Sarat Vemulapalli <[email protected]>
Co-authored-by: Owais Kazi <[email protected]>
(cherry picked from commit 04d9eab)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Copy link
Member

@dbwiddis dbwiddis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please hold off merging this until we decide whether to revert #687.

@owaiskazi19
Copy link
Member

Closing this as we have reverted the changes #799.

@owaiskazi19 owaiskazi19 closed this Jun 1, 2023
@dbwiddis
Copy link
Member

dbwiddis commented Jun 2, 2023

Closing this as we have reverted the changes #799.

But #799 hasn't been merged and we might be fixing the errors in #800 in which case we'd need to re-backport both. Or is #800 going to re-apply the changes we are reverting?

CC @ryanbogan @owaiskazi19

@ryanbogan ryanbogan reopened this Jun 2, 2023
@ryanbogan
Copy link
Member

I'll need to make the manual changes now to the versions

@ryanbogan ryanbogan requested a review from dbwiddis June 6, 2023 16:40
@dbwiddis dbwiddis merged commit 3f4e7b9 into 1.x Jun 7, 2023
@dbwiddis dbwiddis deleted the backport/backport-687-to-1.x branch June 7, 2023 16:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants