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.

Sign up for GitHub

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

Jump to bottom

[Backport][2.x] [Dev] enable `opensearch snapshot` for Darwin (#3537) #3548

Merged

joshuarrrr merged 2 commits into opensearch-project:2.x from kavilla:avillk/2.x/darwinsupport

Mar 8, 2023

Member

kavilla commented Mar 7, 2023

Backport 81a5fad from #3537


          [Dev] enable opensearch snapshot for Darwin (opensearch-project#3537)

8ae6ab1

Enable the downloading of Darwin for running the command
`yarn opensearch snapshot`.

Darwin is not officially supported but snapshots are being
built here:
https://build.ci.opensearch.org/job/distribution-build-opensearch/

Issue resolved:
opensearch-project#2944

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>
Co-authored-by: Josh Romero <rmerqg@amazon.com>

kavilla requested a review from a team as a code owner

March 7, 2023 21:54

kavilla changed the title ~~[Dev] enable opensearch snapshot for Darwin (#3537)~~ [Backport][2.x] [Dev] enable opensearch snapshot for Darwin (#3537)

kavilla added backport 1.x labels

abbyhu2000 approved these changes

View reviewed changes

ananzh approved these changes

View reviewed changes

ashwin-pc assigned kavilla

codecov-commenter commented Mar 7, 2023 •

edited

Loading

Codecov Report

Merging #3548 (3a38a3a) into 2.x (3c613d0) will decrease coverage by 0.06%.
The diff coverage is 100.00%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@            Coverage Diff             @@
##              2.x    #3548      +/-   ##
==========================================
- Coverage   66.44%   66.39%   -0.06%     
==========================================
  Files        3205     3205              
  Lines       61567    61568       +1     
  Branches     9497     9497              
==========================================
- Hits        40909    40876      -33     
- Misses      18386    18414      +28     
- Partials     2272     2278       +6

Flag	Coverage Δ
Linux	`66.39% <100.00%> (+<0.01%)`	⬆️
Windows	`?`

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
packages/osd-opensearch/src/artifact.js	`49.07% <100.00%> (+0.31%)`	⬆️
src/dev/build/lib/get_build_number.ts	`57.14% <0.00%> (-42.86%)`	⬇️
src/setup_node_env/harden/child_process.js	`38.46% <0.00%> (-38.47%)`	⬇️
packages/osd-cross-platform/src/path.ts	`51.21% <0.00%> (-34.15%)`	⬇️
...ges/osd-apm-config-loader/src/config.test.mocks.ts	`91.30% <0.00%> (-8.70%)`	⬇️
src/dev/build/lib/config.ts	`79.41% <0.00%> (-5.89%)`	⬇️
packages/osd-optimizer/src/node/cache.ts	`50.00% <0.00%> (-1.32%)`	⬇️
...ic/application/models/sense_editor/sense_editor.ts	`64.00% <0.00%> (-0.89%)`	⬇️

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


          Merge branch '2.x' into avillk/2.x/darwinsupport

3a38a3a

AMoo-Miki approved these changes

View reviewed changes

Member

joshuarrrr commented Mar 8, 2023

Reviewed whitesource failure, no new vulnerabilities

joshuarrrr approved these changes

View reviewed changes

joshuarrrr merged commit b90fcde into opensearch-project:2.x

joshuarrrr added the v2.7.0 label

Contributor

opensearch-trigger-bot bot commented Mar 8, 2023

The backport to 1.x failed:

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

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

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

Contributor

opensearch-trigger-bot bot commented Mar 8, 2023

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

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

Contributor

opensearch-trigger-bot bot commented Mar 8, 2023

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

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

Contributor

opensearch-trigger-bot bot commented Mar 8, 2023

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

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

Contributor

opensearch-trigger-bot bot commented Mar 8, 2023

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

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

Contributor

opensearch-trigger-bot bot commented Mar 8, 2023

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

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

Contributor

opensearch-trigger-bot bot commented Mar 8, 2023

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

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

Contributor

opensearch-trigger-bot bot commented Mar 8, 2023

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

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

joshuarrrr added the failed backport label

joshuarrrr added backport 2.6 and removed backport 2.0 labels

Contributor

opensearch-trigger-bot bot commented Mar 8, 2023

The backport to 2.6 failed:

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

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

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

Member

joshuarrrr commented Apr 20, 2023

No need to backport everywhere, or even to 2.6 at this point.

joshuarrrr removed the backport 2.6 label

joshuarrrr removed backport 1.x failed backport labels

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels