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

Increment version to 2.4.0.0 #2084

Merged

Conversation

cwperks
Copy link
Member

@cwperks cwperks commented Sep 9, 2022

Signed-off-by: Craig Perkins cwperx@amazon.com

Description

Increments version to 2.4.0.0

  • Category (Enhancement, New feature, Bug fix, Test fix, Refactoring, Maintenance, Documentation)

Maintenance

Issues Resolved

#2063

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.

@cwperks cwperks added the backport 2.x backport to 2.x branch label Sep 9, 2022
@cwperks cwperks requested a review from a team September 9, 2022 18:21
@codecov-commenter
Copy link

codecov-commenter commented Sep 9, 2022

Codecov Report

Merging #2084 (5ce344e) into main (a9f752d) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main    #2084   +/-   ##
=========================================
  Coverage     60.99%   60.99%           
  Complexity     3226     3226           
=========================================
  Files           256      256           
  Lines         18075    18075           
  Branches       3225     3225           
=========================================
  Hits          11024    11024           
  Misses         5472     5472           
  Partials       1579     1579           

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

cliu123
cliu123 previously approved these changes Sep 9, 2022
DarshitChanpura
DarshitChanpura previously approved these changes Sep 9, 2022
@peternied
Copy link
Member

@opensearch-project/engineering-effectiveness I thought release version number incrementing was automated - should PRs like this be opened by your team?

Copy link
Member

@peternied peternied left a comment

Choose a reason for hiding this comment

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

This change is on the wrong branch, it should be done on 2.x instead of main (main should be on 3.x) Lets figure out how this process is handled before attempting to do it ourselves.

@cwperks
Copy link
Member Author

cwperks commented Sep 9, 2022

@peternied Our main branch is currently at 2.3.0. What is preventing main from being at 3.x? We should increment main to 2.4 from 2.3 if we are not planning on pointing it to 3.x yet.

Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Copy link
Member Author

cwperks commented Sep 9, 2022

CI got stuck on CodeQL. I re-pushed the changes to re-trigger CI because I was unable to cancel and restart from Github Actions.

@peternied
Copy link
Member

Lets merge #2085 instead of this, what do you think @cwperks ?

@cwperks
Copy link
Member Author

cwperks commented Sep 9, 2022

@peternied That's fine, but there's additional changes we need to make on top of the other PR. I can checkout the branch and do the changes if needed. Make note of the differences between this PR and the other.

@prudhvigodithi
Copy link
Contributor

Just adding here, https://github.com/opensearch-project/security/blob/2.x/build.gradle#L521-L535
Please update the task to point to the right files, so that once the gradle task is triggered it has all the files for version increment, from the past PR i see .github/workflows/ci.yml file is missing in the task, adding a new entry include(name: ".github/workflows/ci.yml") should work @cwperks @peternied
Thank you

@cwperks
Copy link
Member Author

cwperks commented Sep 9, 2022

@prudhvigodithi We certainly need to add ci.yml to the github workflow, but there's also a version bump miss in the bwc-test/build.gradle

What the version increment automation produced:

Screen Shot 2022-09-09 at 6 41 07 PM

What we expect:

Screen Shot 2022-09-09 at 6 41 16 PM

How can we get the automation to work here?

@getsaurabh02
Copy link
Member

@peternied We need 2.4 snapshots to be generated for the security plugin. This is required to test our integration changes across other plugins (alerting, notification and security-analytics) and is currently a development blocker changes targeted for 2.4.
Are you suggesting #2085 as an alternative to this PR. If yes, what is the blocker for merge there?

@prudhvigodithi
Copy link
Contributor

prudhvigodithi commented Sep 12, 2022

@prudhvigodithi We certainly need to add ci.yml to the github workflow, but there's also a version bump miss in the bwc-test/build.gradle

Hey @cwperks, the BWC version increment has to handled from the plugin end (assuming this requires only during the new minor version), this can be automated but there would be too much assumptions to be considered, each plugin follows an own way to test the BWC.
An open related issue: opensearch-project/opensearch-build#2373
Thank you

Copy link
Member

@peternied peternied left a comment

Choose a reason for hiding this comment

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

Hey folks - thanks for the discussion and revealing the gap in our current infra- yup that is non-trivial. Lets merge this PR and then figure out how we can handle the bwc previous version issue.

@cliu123 cliu123 merged commit fd53d1d into opensearch-project:main Sep 12, 2022
opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 12, 2022
Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit fd53d1d)
cwperks added a commit that referenced this pull request Sep 12, 2022
Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit fd53d1d)

Co-authored-by: Craig Perkins <cwperx@amazon.com>
vinayak15 pushed a commit to vinayak15/security that referenced this pull request Sep 29, 2022
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@peternied peternied mentioned this pull request Nov 4, 2022
23 tasks
stephen-crawford pushed a commit to stephen-crawford/security that referenced this pull request Nov 10, 2022
Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
wuychn pushed a commit to ochprince/security that referenced this pull request Mar 16, 2023
…oject#2088)

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit fd53d1d)

Co-authored-by: Craig Perkins <cwperx@amazon.com>
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants