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

Refactored backwards compatibility tests to point to the OpenSearch 1.1.0.0 zip following deprecation of ODFE. #510

Merged
merged 1 commit into from
Aug 4, 2022

Conversation

AWSHurneyt
Copy link
Collaborator

Signed-off-by: AWSHurneyt hurneyt@amazon.com

Issue #, if available:
#498

Description of changes:
Refactored backwards compatibility tests to point to the OpenSearch 1.1.0.0 zip following deprecation of ODFE.

CheckList:
[x] 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.

….1.0.0 zip following deprecation of ODFE.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
@codecov-commenter
Copy link

codecov-commenter commented Aug 4, 2022

Codecov Report

Merging #510 (2b3d1b0) into main (3b8bfe7) will increase coverage by 0.03%.
The diff coverage is n/a.

@@             Coverage Diff              @@
##               main     #510      +/-   ##
============================================
+ Coverage     76.72%   76.76%   +0.03%     
  Complexity      176      176              
============================================
  Files           166      166              
  Lines          8370     8370              
  Branches       1232     1232              
============================================
+ Hits           6422     6425       +3     
+ Misses         1343     1340       -3     
  Partials        605      605              
Impacted Files Coverage Δ
.../kotlin/org/opensearch/alerting/core/JobSweeper.kt 73.20% <0.00%> (-0.48%) ⬇️
...ain/kotlin/org/opensearch/alerting/AlertService.kt 78.46% <0.00%> (+0.47%) ⬆️
...destinationmigration/DestinationConversionUtils.kt 71.11% <0.00%> (+1.11%) ⬆️
...nationmigration/DestinationMigrationCoordinator.kt 68.08% <0.00%> (+4.25%) ⬆️

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

@AWSHurneyt AWSHurneyt marked this pull request as ready for review August 4, 2022 01:09
@AWSHurneyt AWSHurneyt requested a review from a team August 4, 2022 01:09
@lezzago lezzago merged commit fea6b4a into opensearch-project:main Aug 4, 2022
@opensearch-trigger-bot
Copy link
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-510-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 fea6b4a73c6e79d1beccc03db1bcb48ea67886b8
# Push it to GitHub
git push --set-upstream origin backport/backport-510-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-510-to-1.x.

@opensearch-trigger-bot
Copy link
Contributor

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 4, 2022
….1.0.0 zip following deprecation of ODFE. (#510)

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit fea6b4a)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 4, 2022
….1.0.0 zip following deprecation of ODFE. (#510)

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit fea6b4a)
lezzago pushed a commit that referenced this pull request Aug 5, 2022
….1.0.0 zip following deprecation of ODFE. (#510) (#512)

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit fea6b4a)

Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
lezzago pushed a commit that referenced this pull request Aug 5, 2022
….1.0.0 zip following deprecation of ODFE. (#510) (#511)

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit fea6b4a)

Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
AWSHurneyt added a commit to AWSHurneyt/OpenSearch-Alerting that referenced this pull request Aug 5, 2022
….1.0.0 zip following deprecation of ODFE. (opensearch-project#510) (opensearch-project#512)

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit fea6b4a)

Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
AWSHurneyt added a commit that referenced this pull request Aug 9, 2022
….1.0.0 zip following deprecation of ODFE. (#510) (#517)

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
AWSHurneyt added a commit that referenced this pull request Aug 11, 2022
….1.0.0 zip following deprecation of ODFE. (#510) (#519)

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
toepkerd-zz pushed a commit to toepkerd-zz/alerting that referenced this pull request Sep 28, 2022
….1.0.0 zip following deprecation of ODFE. (opensearch-project#510)

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
eirsep added a commit that referenced this pull request Oct 10, 2022
* Added 2.1 release notes. (#485) (#487)

* Added 2.1 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.1 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit 9f3c393)

Co-authored-by: AWSHurneyt <hurneyt@amazon.com>

* Staging for version increment automation (#489) (#503)

* Version increment automation

Signed-off-by: pgodithi <pgodithi@amazon.com>

* Version increment automation: task rename updateVersion

Signed-off-by: pgodithi <pgodithi@amazon.com>
(cherry picked from commit 3b8bfe7)
Signed-off-by: prudhvigodithi <pgodithi@amazon.com>

Co-authored-by: Prudhvi Godithi <pgodithi@amazon.com>

* Add support for reproducible builds (#472) (#499)

As per gradle [docs] add support to remove timestamps and package with same order which is required from
[reproducible] builds

[docs]: https://docs.gradle.org/current/userguide/working_with_files.html#sec:archives
[reproducible]: https://reproducible-builds.org/

Signed-off-by: Leonidas Spyropoulos <artafinde@archlinux.org>
(cherry picked from commit a27d5a2)
Signed-off-by: prudhvigodithi <pgodithi@amazon.com>

Co-authored-by: Leonidas Spyropoulos <artafinde@gmail.com>

* Refactored backwards compatibility tests to point to the OpenSearch 1.1.0.0 zip following deprecation of ODFE. (#510) (#512)

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
(cherry picked from commit fea6b4a)

Co-authored-by: AWSHurneyt <hurneyt@amazon.com>

* Bumping 2.x branch version from 2.1.0 to 2.2.0. Bumped mockito-core version from 4.3.1 to 4.6.1. (#506)

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.2 release notes. (#514)

* Added 2.2 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.2 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Bumped 2.x branch from version 2.2.0 to 2.3.0. (#547)

* Bumped 2.x branch from version 2.2.0 to 2.3.0.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Bumped mockito core version.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Deprecate the Master nomenclature (#548) (#549)

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>

* Added 2.3 release notes. (#551)

* Added 2.3 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Added 2.3 release notes.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* moving over data models from alerting to common-utils (#556)

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>

* backport monitor datasources to 2.x (#558)

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* expose delete monitor api from alerting (#568)

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>

* Use findings and alerts models, dtos from common utils (#569)

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* Disable ktlint for alerting as it has errors on Windows (#570) (#571)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
(cherry picked from commit 3a844f8)

Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>

* Recreate request object from writeable for Get alerts and get findings (#577)

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* Use alerting models and dtos from common-utils dependencies

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* port over datasources alert index usage correctly

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: AWSHurneyt <hurneyt@amazon.com>
Co-authored-by: Prudhvi Godithi <pgodithi@amazon.com>
Co-authored-by: Leonidas Spyropoulos <artafinde@gmail.com>
Co-authored-by: Subhobrata Dey <sbcd90@gmail.com>
Co-authored-by: Peter Zhu <zhujiaxi@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.

4 participants