Skip to content

Update Jenkins release docker image#784

Merged
dblock merged 1 commit into
opensearch-project:mainfrom
Xtansia:update/jenkins-docker-image
Sep 5, 2024
Merged

Update Jenkins release docker image#784
dblock merged 1 commit into
opensearch-project:mainfrom
Xtansia:update/jenkins-docker-image

Conversation

@Xtansia

@Xtansia Xtansia commented Sep 4, 2024

Copy link
Copy Markdown
Collaborator

Description

Update Jenkins release docker image

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: Thomas Farr <tsfarr@amazon.com>
@Xtansia Xtansia added backport 1.x Backport to 1.x branch backport 1.8 Backport to the 1.8 branch labels Sep 4, 2024
@dblock dblock merged commit e883c8a into opensearch-project:main Sep 5, 2024
@opensearch-trigger-bot

Copy link
Copy Markdown
Contributor

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

@opensearch-trigger-bot

Copy link
Copy Markdown
Contributor

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

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

@Xtansia Xtansia deleted the update/jenkins-docker-image branch September 5, 2024 12:36
Xtansia added a commit to Xtansia/opensearch-net that referenced this pull request Sep 5, 2024
Signed-off-by: Thomas Farr <tsfarr@amazon.com>
(cherry picked from commit e883c8a)
Xtansia added a commit that referenced this pull request Sep 5, 2024
Signed-off-by: Thomas Farr <tsfarr@amazon.com>
(cherry picked from commit e883c8a)
opensearch-trigger-bot Bot pushed a commit that referenced this pull request Sep 5, 2024
Signed-off-by: Thomas Farr <tsfarr@amazon.com>
(cherry picked from commit e883c8a)
(cherry picked from commit 58a6e29)
Xtansia added a commit that referenced this pull request Sep 5, 2024
Signed-off-by: Thomas Farr <tsfarr@amazon.com>
(cherry picked from commit e883c8a)
(cherry picked from commit 58a6e29)

Co-authored-by: Thomas Farr <tsfarr@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 1.x Backport to 1.x branch backport 1.8 Backport to the 1.8 branch skip-changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants