-
Notifications
You must be signed in to change notification settings - Fork 99
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 main CI upstream opensearch imports and use maven repo instead of jenkins #1437
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
Signed-off-by: Derek Ho <dxho@amazon.com>
derek-ho
changed the title
fix ci failures on main
Fix main CI upstream opensearch imports and use maven repo instead of jenkins
Feb 28, 2023
joshuali925
previously approved these changes
Feb 28, 2023
ps48
previously approved these changes
Feb 28, 2023
6 tasks
Signed-off-by: Derek Ho <dxho@amazon.com>
derek-ho
commented
Mar 7, 2023
Comment on lines
+328
to
+329
String remoteFileURL = "https://aws.oss.sonatype.org/content/repositories/snapshots/org/opensearch/plugin/opensearch-observability/2.7.0.0-SNAPSHOT/opensearch-observability-2.7.0.0-20230307.002038-1.zip" | ||
String bwcJobSchedulerURL = "https://aws.oss.sonatype.org/content/repositories/snapshots/org/opensearch/plugin/opensearch-job-scheduler/2.7.0.0-SNAPSHOT/opensearch-job-scheduler-2.7.0.0-20230307.020232-12.zip" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ps48
approved these changes
Mar 7, 2023
kavithacm
approved these changes
Mar 7, 2023
The backport to
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-1437-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 18cd8440c7b1d105fd2c6955d909bbf5984b01da
# Push it to GitHub
git push --set-upstream origin backport/backport-1437-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 |
derek-ho
added a commit
to derek-ho/observability
that referenced
this pull request
Mar 28, 2023
… instead of jenkins (opensearch-project#1437) * fix ci failures on main Signed-off-by: Derek Ho <dxho@amazon.com> * change back some references Signed-off-by: Derek Ho <dxho@amazon.com> * fix up Signed-off-by: Derek Ho <dxho@amazon.com> * try incrementing bwc version to 2.7 Signed-off-by: Derek Ho <dxho@amazon.com> * keep 2.6 Signed-off-by: Derek Ho <dxho@amazon.com> * try using maven Signed-off-by: Derek Ho <dxho@amazon.com> * fix zxip Signed-off-by: Derek Ho <dxho@amazon.com> * fix version Signed-off-by: Derek Ho <dxho@amazon.com> * fix snapshot Signed-off-by: Derek Ho <dxho@amazon.com> * remove job scheduler url reef Signed-off-by: Derek Ho <dxho@amazon.com> * add base version Signed-off-by: Derek Ho <dxho@amazon.com> * hard code Signed-off-by: Derek Ho <dxho@amazon.com> * try configuration zip Signed-off-by: Derek Ho <dxho@amazon.com> * try zip archive Signed-off-by: Derek Ho <dxho@amazon.com> * move dep Signed-off-by: Derek Ho <dxho@amazon.com> * fix imports Signed-off-by: Derek Ho <dxho@amazon.com> * fix last file Signed-off-by: Derek Ho <dxho@amazon.com> * add back job scheduler bwc Signed-off-by: Derek Ho <dxho@amazon.com> * add zip archive Signed-off-by: Derek Ho <dxho@amazon.com> * move ot 2.7.0 bwc Signed-off-by: Derek Ho <dxho@amazon.com> * hard code link Signed-off-by: Derek Ho <dxho@amazon.com> --------- Signed-off-by: Derek Ho <dxho@amazon.com> (cherry picked from commit 18cd844) Signed-off-by: Derek Ho <dxho@amazon.com>
6 tasks
derek-ho
added a commit
that referenced
this pull request
Mar 29, 2023
* [BACKPORT] Fix main CI upstream opensearch imports and use maven repo instead of jenkins (#1437) * fix ci failures on main Signed-off-by: Derek Ho <dxho@amazon.com> * change back some references Signed-off-by: Derek Ho <dxho@amazon.com> * fix up Signed-off-by: Derek Ho <dxho@amazon.com> * try incrementing bwc version to 2.7 Signed-off-by: Derek Ho <dxho@amazon.com> * keep 2.6 Signed-off-by: Derek Ho <dxho@amazon.com> * try using maven Signed-off-by: Derek Ho <dxho@amazon.com> * fix zxip Signed-off-by: Derek Ho <dxho@amazon.com> * fix version Signed-off-by: Derek Ho <dxho@amazon.com> * fix snapshot Signed-off-by: Derek Ho <dxho@amazon.com> * remove job scheduler url reef Signed-off-by: Derek Ho <dxho@amazon.com> * add base version Signed-off-by: Derek Ho <dxho@amazon.com> * hard code Signed-off-by: Derek Ho <dxho@amazon.com> * try configuration zip Signed-off-by: Derek Ho <dxho@amazon.com> * try zip archive Signed-off-by: Derek Ho <dxho@amazon.com> * move dep Signed-off-by: Derek Ho <dxho@amazon.com> * fix imports Signed-off-by: Derek Ho <dxho@amazon.com> * fix last file Signed-off-by: Derek Ho <dxho@amazon.com> * add back job scheduler bwc Signed-off-by: Derek Ho <dxho@amazon.com> * add zip archive Signed-off-by: Derek Ho <dxho@amazon.com> * move ot 2.7.0 bwc Signed-off-by: Derek Ho <dxho@amazon.com> * hard code link Signed-off-by: Derek Ho <dxho@amazon.com> --------- Signed-off-by: Derek Ho <dxho@amazon.com> (cherry picked from commit 18cd844) Signed-off-by: Derek Ho <dxho@amazon.com> * missing build.gradle conflict resolution Signed-off-by: Derek Ho <dxho@amazon.com> --------- Signed-off-by: Derek Ho <dxho@amazon.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Use maven repo instead of jenkins to pull job scheduler images based on github workflows... As well as fix imports from upstream opensearch.
Issues Resolved
#1438
Check List
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.