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

Updated Version.java path from server to libs in version.yml #8883

Merged
merged 5 commits into from
Jul 26, 2023
Merged

Updated Version.java path from server to libs in version.yml #8883

merged 5 commits into from
Jul 26, 2023

Conversation

vibrantvarun
Copy link
Member

@vibrantvarun vibrantvarun commented Jul 25, 2023

Description

PR #7328 moved Version.java from :server to :libs:opensearch-core. This commit updates Version.java path in version.yml from server/src/main/java/org/opensearch/Version.java to libs/core/src/main/java/org/opensearch/Version.java

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

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
  • Commit changes are listed out in CHANGELOG.md file (See: Changelog)

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: Varun Jain <varunudr@amazon.com>
@vibrantvarun vibrantvarun changed the title Updating Version.java from server/ to buildSrc/ Updated Version.java path from server to buildSrc in version.yml Jul 25, 2023
@kotwanikunal
Copy link
Member

@vibrantvarun Can you please describe what you are trying to achieve in the description section of the PR?

Signed-off-by: Varun Jain <varunudr@amazon.com>
@prudhvigodithi
Copy link
Contributor

Thanks @vibrantvarun I assume the sed logic still works with the file buildSrc/src/main/java/org/opensearch/gradle/Version.java.

CHANGELOG.md Outdated Show resolved Hide resolved
.github/workflows/version.yml Outdated Show resolved Hide resolved
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      2 org.opensearch.search.suggest.CompletionSuggestSearchIT.testSkipDuplicates
      1 org.opensearch.index.IndexServiceTests.testAsyncTranslogTrimTaskOnClosedIndex
      1 org.opensearch.cluster.allocation.ClusterRerouteIT.testDelayWithALargeAmountOfShards

Signed-off-by: Varun Jain <varunudr@amazon.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.indices.replication.SegmentReplicationTargetServiceTests.testShardAlreadyReplicating
      1 org.opensearch.indices.replication.SegmentReplicationIT.testScrollCreatedOnReplica
      1 org.opensearch.indices.replication.SegmentReplicationIT.classMethod
      1 org.opensearch.index.ShardIndexingPressureIT.testShardIndexingPressureTrackingDuringBulkWrites

@andrross
Copy link
Member

Thanks @vibrantvarun I assume the sed logic still works with the file buildSrc/src/main/java/org/opensearch/gradle/Version.java.

@vibrantvarun Can you run the sed commands manually against the correct file and verify it still works? @kotwanikunal please chime in if there's a better way to test this.

@vibrantvarun
Copy link
Member Author

@andrross sure, taking a look into it.

Signed-off-by: Varun Jain <varunudr@amazon.com>
@vibrantvarun vibrantvarun changed the title Updated Version.java path from server to buildSrc in version.yml Updated Version.java path from server to libs in version.yml Jul 26, 2023
@owaiskazi19
Copy link
Member

@vibrantvarun Can you please describe what you are trying to achieve in the description section of the PR?

Looks like these changes were missed here.

@kotwanikunal
Copy link
Member

@vibrantvarun Can you please describe what you are trying to achieve in the description section of the PR?

Looks like these changes were missed here.

Thanks. I was looking for this context :)

@kotwanikunal
Copy link
Member

Thanks @vibrantvarun I assume the sed logic still works with the file buildSrc/src/main/java/org/opensearch/gradle/Version.java.

@vibrantvarun Can you run the sed commands manually against the correct file and verify it still works? @kotwanikunal please chime in if there's a better way to test this.

That's the only way. @vibrantvarun You can test this by cloning OpenSearch and running this script from the root folder -
https://gist.github.com/kotwanikunal/91f33eeced50f6aa93701e91a2e93a6b

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      1 org.opensearch.remotestore.RemoteStoreIT.testRemoteTranslogRestoreWithNoDataPostRefresh

@vibrantvarun
Copy link
Member Author

@kotwanikunal
The output of running above script on local

TAG=2.9.0
BASE=2.9
BASE_X=2.x
CURRENT_VERSION=2.9.0
CURRENT_VERSION_UNDERSCORE=V_2_9_0
NEXT_VERSION=2.9.1
NEXT_VERSION_UNDERSCORE=V_2_9_1
NEXT_VERSION_ID=2090199
Incrementing 2.9.0 to 2.9.1
version.sh: line 32: .ci/bwcVersions: No such file or directory
sed: 1: "buildSrc/version.proper ...": undefined label 'uildSrc/version.properties'
Adding V_2_9_1 after V_2_9_0

It works.

@kotwanikunal
Copy link
Member

@kotwanikunal The output of running above script on local

TAG=2.9.0
BASE=2.9
BASE_X=2.x
CURRENT_VERSION=2.9.0
CURRENT_VERSION_UNDERSCORE=V_2_9_0
NEXT_VERSION=2.9.1
NEXT_VERSION_UNDERSCORE=V_2_9_1
NEXT_VERSION_ID=2090199
Incrementing 2.9.0 to 2.9.1
version.sh: line 32: .ci/bwcVersions: No such file or directory
sed: 1: "buildSrc/version.proper ...": undefined label 'uildSrc/version.properties'
Adding V_2_9_1 after V_2_9_0

It works.

I can see errors on the output. Did you test it against the OpenSearch repo cloned code base?

@vibrantvarun
Copy link
Member Author

vibrantvarun commented Jul 26, 2023

@kotwanikunal Okay I debugged the issue with the script. Actually in mac os the sed command looks like

sed -i -e "s/opensearch = $CURRENT_VERSION/opensearch = $NEXT_VERSION/g" buildSrc/version.properties

We have to add -e in the command

So after I added -e below is the output

TAG=2.9.0
BASE=2.9
BASE_X=2.x
CURRENT_VERSION=2.9.0
CURRENT_VERSION_UNDERSCORE=V_2_9_0
NEXT_VERSION=2.9.1
NEXT_VERSION_UNDERSCORE=V_2_9_1
NEXT_VERSION_ID=2090199
Incrementing 2.9.0 to 2.9.1
Adding V_2_9_1 after V_2_9_0

Thanks for pointing it out

@kotwanikunal
Copy link
Member

@vibrantvarun Please resolve all conversations before we can merge this in.

@vibrantvarun
Copy link
Member Author

@kotwanikunal resolved all conversations

@ryanbogan ryanbogan merged commit 99f28cb into opensearch-project:main Jul 26, 2023
12 checks passed
@vibrantvarun vibrantvarun added the backport 2.x Backport to 2.x branch label Jul 26, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jul 26, 2023
* Updating Version.java from server/ to buildSrc/

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Adding Changelog

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Path update

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Changelog Update

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Removing Changelog from commit

Signed-off-by: Varun Jain <varunudr@amazon.com>

---------

Signed-off-by: Varun Jain <varunudr@amazon.com>
(cherry picked from commit 99f28cb)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@prudhvigodithi
Copy link
Contributor

Hey @vibrantvarun this only runs when a new tag is cut which takes in the tag information https://github.com/opensearch-project/OpenSearch/blob/main/.github/workflows/version.yml#L24. So to re-produce one way is to delete and re-create tag which is no right thing to do now, please raise a manual PR for 2.9.1 similar to 2.8.1 and lets keep monitoring for the next patch version increment.
Thank you

kotwanikunal pushed a commit that referenced this pull request Jul 26, 2023
…8895)

* Updating Version.java from server/ to buildSrc/



* Adding Changelog



* Path update



* Changelog Update



* Removing Changelog from commit



---------


(cherry picked from commit 99f28cb)

Signed-off-by: Varun Jain <varunudr@amazon.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>
sarthakaggarwal97 pushed a commit to sarthakaggarwal97/OpenSearch that referenced this pull request Jul 27, 2023
…rch-project#8883)

* Updating Version.java from server/ to buildSrc/

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Adding Changelog

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Path update

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Changelog Update

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Removing Changelog from commit

Signed-off-by: Varun Jain <varunudr@amazon.com>

---------

Signed-off-by: Varun Jain <varunudr@amazon.com>
baba-devv pushed a commit to baba-devv/OpenSearch that referenced this pull request Jul 29, 2023
…rch-project#8883)

* Updating Version.java from server/ to buildSrc/

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Adding Changelog

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Path update

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Changelog Update

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Removing Changelog from commit

Signed-off-by: Varun Jain <varunudr@amazon.com>

---------

Signed-off-by: Varun Jain <varunudr@amazon.com>
kaushalmahi12 pushed a commit to kaushalmahi12/OpenSearch that referenced this pull request Sep 12, 2023
…rch-project#8883)

* Updating Version.java from server/ to buildSrc/

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Adding Changelog

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Path update

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Changelog Update

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Removing Changelog from commit

Signed-off-by: Varun Jain <varunudr@amazon.com>

---------

Signed-off-by: Varun Jain <varunudr@amazon.com>
Signed-off-by: Kaushal Kumar <ravi.kaushal97@gmail.com>
brusic pushed a commit to brusic/OpenSearch that referenced this pull request Sep 25, 2023
…rch-project#8883)

* Updating Version.java from server/ to buildSrc/

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Adding Changelog

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Path update

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Changelog Update

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Removing Changelog from commit

Signed-off-by: Varun Jain <varunudr@amazon.com>

---------

Signed-off-by: Varun Jain <varunudr@amazon.com>
Signed-off-by: Ivan Brusic <ivan.brusic@flocksafety.com>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…rch-project#8883)

* Updating Version.java from server/ to buildSrc/

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Adding Changelog

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Path update

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Changelog Update

Signed-off-by: Varun Jain <varunudr@amazon.com>

* Removing Changelog from commit

Signed-off-by: Varun Jain <varunudr@amazon.com>

---------

Signed-off-by: Varun Jain <varunudr@amazon.com>
Signed-off-by: Shivansh Arora <hishiv@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 skip-changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants