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 main CI upstream opensearch imports and use maven repo instead of jenkins #1437

Merged
merged 21 commits into from
Mar 7, 2023

Conversation

derek-ho
Copy link
Collaborator

@derek-ho derek-ho commented Feb 27, 2023

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

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • 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: Derek Ho <dxho@amazon.com>
@derek-ho derek-ho requested a review from a team as a code owner February 27, 2023 16:18
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>
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 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
joshuali925 previously approved these changes Feb 28, 2023
ps48
ps48 previously approved these changes Feb 28, 2023
Signed-off-by: Derek Ho <dxho@amazon.com>
@derek-ho derek-ho dismissed stale reviews from ps48 and joshuali925 via faa777b March 7, 2023 14:56
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"
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@derek-ho derek-ho merged commit 18cd844 into opensearch-project:main Mar 7, 2023
@opensearch-trigger-bot
Copy link
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-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 base branch is 2.x and the compare/head branch is backport/backport-1437-to-2.x.

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>
@derek-ho derek-ho mentioned this pull request Mar 28, 2023
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants