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

Update GA worklows to use JDK 21.0.2 #436

Merged
merged 1 commit into from
Jan 24, 2024

Conversation

reta
Copy link
Contributor

@reta reta commented Jan 23, 2024

Description

We should be all set to use JDK 21.0.2 (with mitigation in place opensearch-project/OpenSearch#11968)

Issues Resolved

Follow up on #426

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.

@github-actions github-actions bot added the backport 2.x backport PRs to 2.x branch label Jan 23, 2024
Copy link

codecov bot commented Jan 23, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (f039d7f) 71.88% compared to head (b28df61) 71.88%.

Additional details and impacted files
@@            Coverage Diff            @@
##               main     #436   +/-   ##
=========================================
  Coverage     71.88%   71.88%           
  Complexity      620      620           
=========================================
  Files            78       78           
  Lines          3126     3126           
  Branches        236      236           
=========================================
  Hits           2247     2247           
  Misses          772      772           
  Partials        107      107           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@dbwiddis dbwiddis left a comment

Choose a reason for hiding this comment

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

Thanks! I had noticed my PR elsewhere suddenly started passing and was going to do this myself but you beat me to it.

Is the fix also backported? We made the change on our 2.x.

@owaiskazi19
Copy link
Member

Multi node macos tests are failing. Looks like flaky. Will re-run again.


REPRODUCE WITH: ./gradlew ':integTest' --tests "org.opensearch.flowframework.rest.FlowFrameworkRestApiIT.testCreateAndProvisionLocalModelWorkflow" -Dtests.seed=D547C03408549E1E -Dtests.security.manager=false -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=fr-CA -Dtests.timezone=America/Halifax -Druntime.java=21

org.opensearch.flowframework.rest.FlowFrameworkRestApiIT > testCreateAndProvisionLocalModelWorkflow FAILED
    java.lang.AssertionError: expected:<2> but was:<4>
        at __randomizedtesting.SeedInfo.seed([D547C03408549E1E:B44F0247AC7F19DD]:0)
        at org.junit.Assert.fail(Assert.java:89)
        at org.junit.Assert.failNotEquals(Assert.java:835)
        at org.junit.Assert.assertEquals(Assert.java:647)
        at org.junit.Assert.assertEquals(Assert.java:633)
        at org.opensearch.flowframework.rest.FlowFrameworkRestApiIT.testCreateAndProvisionLocalModelWorkflow(FlowFrameworkRestApiIT.java:167)


REPRODUCE WITH: ./gradlew ':integTest' --tests "org.opensearch.flowframework.rest.FlowFrameworkRestApiIT.testCreateAndProvisionAgentFrameworkWorkflow" -Dtests.seed=D547C03408549E1E -Dtests.security.manager=false -Dtests.jvm.argline="-XX:TieredStopAtLevel=1 -XX:ReservedCodeCacheSize=64m" -Dtests.locale=fr-CA -Dtests.timezone=America/Halifax -Druntime.java=21
org.opensearch.flowframework.rest.FlowFrameworkRestApiIT > testCreateAndProvisionAgentFrameworkWorkflow FAILED
    org.junit.ComparisonFailure: expected:<[COMPLET]ED> but was:<[FAIL]ED>
        at __randomizedtesting.SeedInfo.seed([D547C03408549E1E:67B85B2705D58904]:0)
        at org.junit.Assert.assertEquals(Assert.java:117)
        at org.junit.Assert.assertEquals(Assert.java:146)
        at org.opensearch.flowframework.FlowFrameworkRestTestCase.getAndAssertWorkflowStatus(FlowFrameworkRestTestCase.java:575)
        at org.opensearch.flowframework.rest.FlowFrameworkRestApiIT.lambda$testCreateAndProvisionAgentFrameworkWorkflow$9(FlowFrameworkRestApiIT.java:258)
        at org.opensearch.test.OpenSearchTestCase.assertBusy(OpenSearchTestCase.java:1089)
        at org.opensearch.flowframework.rest.FlowFrameworkRestApiIT.testCreateAndProvisionAgentFrameworkWorkflow(FlowFrameworkRestApiIT.java:257)

@owaiskazi19 owaiskazi19 merged commit 450a801 into opensearch-project:main Jan 24, 2024
26 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/flow-framework/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/flow-framework/backport-2.x
# Create a new branch
git switch --create backport/backport-436-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 450a801ce316fdd04623385dbc5aa04e67f0550a
# Push it to GitHub
git push --set-upstream origin backport/backport-436-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/flow-framework/backport-2.x

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport PRs to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants