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

fix distribution builds #1640

Merged
merged 3 commits into from
Aug 6, 2024
Merged

Conversation

sbcd90
Copy link
Collaborator

@sbcd90 sbcd90 commented Aug 5, 2024

Issue #, if available:
#1617

Description of changes:
fix distribution builds

CheckList:

  • 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: Subhobrata Dey <[email protected]>

update fix

Signed-off-by: Subhobrata Dey <[email protected]>

add a dummy test

Signed-off-by: Subhobrata Dey <[email protected]>

fix distribution builds

Signed-off-by: Subhobrata Dey <[email protected]>
Signed-off-by: Subhobrata Dey <[email protected]>
@AWSHurneyt
Copy link
Collaborator

Related issue #1641

@AWSHurneyt AWSHurneyt merged commit 07fb522 into opensearch-project:main Aug 6, 2024
17 of 18 checks passed
@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/alerting/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/alerting/backport-2.x
# Create a new branch
git switch --create backport-1640-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 07fb52227c6641d61cc08faeb4426a1767d5e805
# Push it to GitHub
git push --set-upstream origin backport-1640-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting/backport-2.x

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

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.16 failed:

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

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/alerting/backport-2.16 2.16
# Navigate to the new working tree
pushd ../.worktrees/alerting/backport-2.16
# Create a new branch
git switch --create backport-1640-to-2.16
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 07fb52227c6641d61cc08faeb4426a1767d5e805
# Push it to GitHub
git push --set-upstream origin backport-1640-to-2.16
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/alerting/backport-2.16

Then, create a pull request where the base branch is 2.16 and the compare/head branch is backport-1640-to-2.16.

AWSHurneyt added a commit to AWSHurneyt/OpenSearch-Alerting that referenced this pull request Aug 6, 2024
* fix distribution builds

Signed-off-by: Subhobrata Dey <[email protected]>

update fix

Signed-off-by: Subhobrata Dey <[email protected]>

add a dummy test

Signed-off-by: Subhobrata Dey <[email protected]>

fix distribution builds

Signed-off-by: Subhobrata Dey <[email protected]>

* remove dummy tests

Signed-off-by: Subhobrata Dey <[email protected]>

* Removed tests per offline discussion.

Signed-off-by: AWSHurneyt <[email protected]>

---------

Signed-off-by: Subhobrata Dey <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>
Co-authored-by: AWSHurneyt <[email protected]>

(cherry picked from commit 07fb522)
Signed-off-by: AWSHurneyt <[email protected]>
AWSHurneyt added a commit to AWSHurneyt/OpenSearch-Alerting that referenced this pull request Aug 6, 2024
* fix distribution builds

Signed-off-by: Subhobrata Dey <[email protected]>

update fix

Signed-off-by: Subhobrata Dey <[email protected]>

add a dummy test

Signed-off-by: Subhobrata Dey <[email protected]>

fix distribution builds

Signed-off-by: Subhobrata Dey <[email protected]>

* remove dummy tests

Signed-off-by: Subhobrata Dey <[email protected]>

* Removed tests per offline discussion.

Signed-off-by: AWSHurneyt <[email protected]>

---------

Signed-off-by: Subhobrata Dey <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>
Co-authored-by: AWSHurneyt <[email protected]>

(cherry picked from commit 07fb522)
Signed-off-by: AWSHurneyt <[email protected]>
riysaxen-amzn pushed a commit that referenced this pull request Aug 6, 2024
* fix distribution builds



update fix



add a dummy test



fix distribution builds



* remove dummy tests



* Removed tests per offline discussion.



---------





(cherry picked from commit 07fb522)

Signed-off-by: Subhobrata Dey <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>
Co-authored-by: Subhobrata Dey <[email protected]>
riysaxen-amzn pushed a commit that referenced this pull request Aug 6, 2024
* fix distribution builds



update fix



add a dummy test



fix distribution builds



* remove dummy tests



* Removed tests per offline discussion.



---------





(cherry picked from commit 07fb522)

Signed-off-by: Subhobrata Dey <[email protected]>
Signed-off-by: AWSHurneyt <[email protected]>
Co-authored-by: Subhobrata Dey <[email protected]>
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.

3 participants