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 docker OS cluster with different JDK version #276

Merged
merged 2 commits into from
Jan 26, 2023

Conversation

Tjofil
Copy link
Contributor

@Tjofil Tjofil commented Jan 23, 2023

Signed-off-by: Filip Drobnjakovic [email protected]

Is your feature request related to a problem? Please provide an existing Issue # , or describe.
Issue #162

Describe the solution you are proposing
Workflow matrix parameter is passed through gradle argument and then to Dockerfile where corresponding JDK version is downloaded and placed in the plain 'jdk' folder to reduce further parameterization and complication of Dockerfile.
Also we add conditional jvm.options hack line because of #161, once it's solved we can get rid of it.

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

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.

Signed-off-by: Filip Drobnjakovic <[email protected]>
@Tjofil Tjofil requested a review from a team January 23, 2023 12:23
@codecov-commenter
Copy link

codecov-commenter commented Jan 23, 2023

Codecov Report

Merging #276 (9d71bbf) into main (7c52078) will decrease coverage by 0.04%.
The diff coverage is n/a.

❗ Current head 9d71bbf differs from pull request most recent head ea83899. Consider uploading reports for the commit ea83899 to get more accurate results

@@             Coverage Diff              @@
##               main     #276      +/-   ##
============================================
- Coverage     71.54%   71.51%   -0.04%     
+ Complexity     2987     2985       -2     
============================================
  Files           380      380              
  Lines         18984    18984              
  Branches       1463     1463              
============================================
- Hits          13583    13576       -7     
- Misses         4805     4810       +5     
- Partials        596      598       +2     
Impacted Files Coverage Δ
...nceanalyzer/rca/samplers/MetricsDBFileSampler.java 75.00% <0.00%> (-9.10%) ⬇️
...nalyzer/rca/net/handler/PublishRequestHandler.java 73.46% <0.00%> (-4.09%) ⬇️
...nsearch/performanceanalyzer/rca/RcaController.java 80.61% <0.00%> (-0.45%) ⬇️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@@ -10,10 +10,22 @@
################################################################################

FROM centos:7 AS prep_open_search_files
ARG JDK_VER=11
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need this? As this will automatically set to 11 from workflow logic.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, you're right, from the workflow point of view it doesn't do much. I left it as a default value in the case someone deploys this locally, because we use the same Dockerfile here so that docker build can be called without build args.

@sgup432
Copy link
Contributor

sgup432 commented Jan 25, 2023

Look good to me overall. One minor comment.

@kkhatua kkhatua self-requested a review January 26, 2023 00:17
@khushbr
Copy link
Collaborator

khushbr commented Jan 26, 2023

Thank you for taking care of this @Tjofil

@khushbr khushbr merged commit 4734d6d into opensearch-project:main Jan 26, 2023
@opensearch-trigger-bot
Copy link

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-276-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 4734d6d5ba68ba41b6c62ab2cbf5ff22aa52a186
# Push it to GitHub
git push --set-upstream origin backport/backport-276-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-276-to-2.x.

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.

5 participants