Skip to content

Add 1.3.2 version to main causing gradle check failures#2679

Merged
dreamer-89 merged 1 commit intoopensearch-project:mainfrom
dreamer-89:fix-main
Mar 31, 2022
Merged

Add 1.3.2 version to main causing gradle check failures#2679
dreamer-89 merged 1 commit intoopensearch-project:mainfrom
dreamer-89:fix-main

Conversation

@dreamer-89
Copy link
Copy Markdown
Member

@dreamer-89 dreamer-89 commented Mar 31, 2022

Signed-off-by: Suraj Singh surajrider@gmail.com

Description

Add 1.3.2 in main post 1.3 version bump to 1.3.2 here

Issues Resolved

Existing gradle check failures on main

* What went wrong:
Execution failed for task ':distribution:bwc:bugfix:buildBwcLinuxTar'.
> Building 1.3.1 didn't generate expected file /var/CITOOL/workflow/OpenSearch_CI/PR_Checks/Gradle_Check/search/distribution/bwc/bugfix/build/bwc/checkout-1.3/distribution/archives/linux-tar/build/distributions/opensearch-min-1.3.1-SNAPSHOT-linux-x64.tar.gz

Sample impacted PR: #2601

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: Suraj Singh <surajrider@gmail.com>
@dreamer-89 dreamer-89 requested a review from a team as a code owner March 31, 2022 03:45
Copy link
Copy Markdown
Contributor

@tlfeng tlfeng left a comment

Choose a reason for hiding this comment

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

Looks good!

@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

✅   Gradle Check success f09780e
Log 3956

Reports 3956

@dreamer-89 dreamer-89 merged commit e051a42 into opensearch-project:main Mar 31, 2022
@dreamer-89 dreamer-89 deleted the fix-main branch March 31, 2022 04:33
@dblock dblock added backport 2.x Backport to 2.x branch backport 2.0 Backport to 2.0 branch labels Mar 31, 2022
opensearch-trigger-bot bot pushed a commit that referenced this pull request Mar 31, 2022
Signed-off-by: Suraj Singh <surajrider@gmail.com>
(cherry picked from commit e051a42)
@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

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-2679-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e051a426d2d0b7e986bd81feb82ec7cb1baf674f
# Push it to GitHub
git push --set-upstream origin backport/backport-2679-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-2679-to-2.x.

@dblock
Copy link
Copy Markdown
Member

dblock commented Mar 31, 2022

@dreamer-89 Could you please backport these to 2.x and 2.0? Thank you!

dreamer-89 added a commit that referenced this pull request Mar 31, 2022
Signed-off-by: Suraj Singh <surajrider@gmail.com>
(cherry picked from commit e051a42)

Add 1.3.2 to 2.0 branch

Signed-off-by: Suraj Singh <surajrider@gmail.com>
dreamer-89 added a commit that referenced this pull request Mar 31, 2022
Signed-off-by: Suraj Singh <surajrider@gmail.com>
(cherry picked from commit e051a42)
dreamer-89 added a commit that referenced this pull request Mar 31, 2022
Signed-off-by: Suraj Singh <surajrider@gmail.com>
(cherry picked from commit e051a42)
dreamer-89 added a commit that referenced this pull request Mar 31, 2022
* Add 1.3.2 to main causing gradle check failures (#2679)

Signed-off-by: Suraj Singh <surajrider@gmail.com>
(cherry picked from commit e051a42)

* Add 1.3.2 to main causing gradle check failures (#2679)

Signed-off-by: Suraj Singh <surajrider@gmail.com>
(cherry picked from commit e051a42)

* Remove 1.4.0 bwc version

Signed-off-by: Suraj Singh <surajrider@gmail.com>
dblock pushed a commit that referenced this pull request Mar 31, 2022
Signed-off-by: Suraj Singh <surajrider@gmail.com>
(cherry picked from commit e051a42)

Add 1.3.2 to 2.0 branch

Signed-off-by: Suraj Singh <surajrider@gmail.com>

Co-authored-by: Suraj Singh <79435743+dreamer-89@users.noreply.github.com>
kartg pushed a commit to kartg/OpenSearch that referenced this pull request Apr 1, 2022
)

Signed-off-by: Suraj Singh <surajrider@gmail.com>
kartg added a commit that referenced this pull request Apr 1, 2022
* Fixing thread leak errors in tests

This was occurring due to unused NoOpClient instances that were leftover from refactoring.
Since the client was never closed, this caused multiple tests to fail incorrectly.

Signed-off-by: Kartik Ganesh <gkart@amazon.com>

* Add 1.3.2 to main causing gradle check failures (#2679)

Signed-off-by: Suraj Singh <surajrider@gmail.com>

Co-authored-by: Suraj Singh <79435743+dreamer-89@users.noreply.github.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 backport 2.0 Backport to 2.0 branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants