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

Run integ tests in parallel with build #94

Merged
merged 3 commits into from
Oct 16, 2023
Merged

Run integ tests in parallel with build #94

merged 3 commits into from
Oct 16, 2023

Conversation

dbwiddis
Copy link
Member

@dbwiddis dbwiddis commented Oct 14, 2023

Description

Inspired by discussion on #84 (Thanks @owaiskazi19)

  1. Removes the repo conditional on spotless and javadoc checks, so you don't need to submit the PR to get alerted about those failures.
  2. Separates the integTest and yamlRestTest tasks into a separate job that runs in parallel with the remaining gradle checks. Right now they both take about the same time to complete. If Integ tests start growing longer we can split these two out further.
  3. Adds more JDKs to the build matrix. Note: I think 3 JDKs on 3 OS's for both test and integ is probably too much, probably should reduce them.

image

image

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@codecov
Copy link

codecov bot commented Oct 14, 2023

Codecov Report

Merging #94 (3e4211a) into main (9784f41) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main      #94   +/-   ##
=========================================
  Coverage     81.82%   81.82%           
  Complexity      285      285           
=========================================
  Files            30       30           
  Lines          1117     1117           
  Branches        125      125           
=========================================
  Hits            914      914           
  Misses          158      158           
  Partials         45       45           

Signed-off-by: Daniel Widdis <widdis@gmail.com>
.github/workflows/CI.yml Outdated Show resolved Hide resolved
.github/workflows/CI.yml Show resolved Hide resolved
@owaiskazi19
Copy link
Member

owaiskazi19 commented Oct 16, 2023

To discuss the 3 JDKs mentioned in the PR description. The below JDK version are needed for the respective branches/development purpose.

11 -> 2.x
20 -> 3.0
17 -> for our development

We can run 17 on just ubuntu though.

@dbwiddis
Copy link
Member Author

To discuss the 3 JDKs mentioned in the PR description. The below JDK version are needed for the respective branches/development purpose.

11 -> 2.x
20 -> 3.0
17 -> for our development

We can run 17 on just ubuntu though.

So this should be 17 (ubuntu only) and 20 on main, and 17 (ubuntu only) and 11 on backport?

@owaiskazi19
Copy link
Member

So this should be 17 (ubuntu only) and 20 on main, and 17 (ubuntu only) and 11 on backport?

If we are running 11 on just backport/2.x, that way we won't be able to catch any issues on main which are not supported on JDK11.

Signed-off-by: Daniel Widdis <widdis@gmail.com>
@dbwiddis
Copy link
Member Author

image

Copy link
Member

@owaiskazi19 owaiskazi19 left a comment

Choose a reason for hiding this comment

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

Thanks for this!

@dbwiddis dbwiddis merged commit c84321f into opensearch-project:main Oct 16, 2023
21 checks passed
@dbwiddis dbwiddis deleted the ci branch October 16, 2023 17:57
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 16, 2023
* Run integ tests in parallel with build

Signed-off-by: Daniel Widdis <widdis@gmail.com>

* Repo check on all runs, reduce JDK17 runs to ubuntu only

Signed-off-by: Daniel Widdis <widdis@gmail.com>

---------

Signed-off-by: Daniel Widdis <widdis@gmail.com>
Co-authored-by: Joshua Palis <jpalis@amazon.com>
(cherry picked from commit c84321f)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
dbwiddis added a commit that referenced this pull request Oct 17, 2023
* Run integ tests in parallel with build (#94)

* Run integ tests in parallel with build

Signed-off-by: Daniel Widdis <widdis@gmail.com>

* Repo check on all runs, reduce JDK17 runs to ubuntu only

Signed-off-by: Daniel Widdis <widdis@gmail.com>

---------

Signed-off-by: Daniel Widdis <widdis@gmail.com>
Co-authored-by: Joshua Palis <jpalis@amazon.com>
(cherry picked from commit c84321f)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Remove JDK20 from backport CI

Signed-off-by: Daniel Widdis <widdis@gmail.com>

* Remove the other JDK20 

Signed-off-by: Daniel Widdis <widdis@gmail.com>

---------

Signed-off-by: Daniel Widdis <widdis@gmail.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Joshua Palis <jpalis@amazon.com>
Co-authored-by: Daniel Widdis <widdis@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport PRs to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants