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

Add Java 11/17/21 matrix for plugin install, test and integration test checks #3641

Merged
merged 1 commit into from
Nov 3, 2023

Conversation

reta
Copy link
Collaborator

@reta reta commented Nov 2, 2023

Description

Add Java 11/17/21 matrix for plugin install, test and integration test checks

Issues Resolved

Part of opensearch-project/OpenSearch#10334

Testing

N/A

Check List

  • New functionality includes testing
  • New functionality has been documented
  • 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.

@reta reta changed the title Add Java 11/17/21 matrix for plugin install and integration (main only) checks Add Java 11/17/21 matrix for plugin install, test and integration test checks Nov 2, 2023
@willyborankin
Copy link
Collaborator

@reta WDYT to use JDK 11 only for 1.x branch? The reason i'm asking is the fact that we can introduce OpenSAML 5.x for 2.x version only.

@reta
Copy link
Collaborator Author

reta commented Nov 3, 2023

@reta WDYT to use JDK 11 only for 1.x branch? The reason i'm asking is the fact that we can introduce OpenSAML 5.x for 2.x version only.

I think you are asking about 2.x? Because 1.x is JDK-8 based but in general, there are good reasons to deliver 2.x with JDK-21 but this is not decided yet (see please opensearch-project/OpenSearch#11003), so 2.x is officially supported on 11 and 17.

@DarshitChanpura DarshitChanpura merged commit 5f1058a into opensearch-project:main Nov 3, 2023
75 checks passed
@DarshitChanpura
Copy link
Member

@reta @willyborankin Based on the discussion above, backport 2.x label is not required. Is that correct?

@reta
Copy link
Collaborator Author

reta commented Nov 3, 2023

@reta @willyborankin Based on the discussion above, backport 2.x label is not required. Is that correct?

Correct, at least for now - no backport, thanks a lot @DarshitChanpura

@reta reta added the backport 2.x backport to 2.x branch label Nov 14, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/security/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/security/backport-2.x
# Create a new branch
git switch --create backport/backport-3641-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5f1058ad0418d8a8711d94fa7fdc467788e2de6f
# Push it to GitHub
git push --set-upstream origin backport/backport-3641-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/security/backport-2.x

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

reta added a commit to reta/security that referenced this pull request Nov 14, 2023
willyborankin pushed a commit that referenced this pull request Nov 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport to 2.x branch ci
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants