Skip to content

[Improvement][E2E] support e2e compose v2 fix code style #15325

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.

Sign up for GitHub

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

Jump to bottom
Merged
SbloodyS merged 9 commits into from
Dec 27, 2023
Merged

[Improvement][E2E] support e2e compose v2 fix code style #15325

SbloodyS merged 9 commits into from
Dec 27, 2023

Conversation

@jackyyyyyssss
Copy link
Contributor

@jackyyyyyssss jackyyyyyssss commented Dec 15, 2023 •
edited
Loading

Purpose of the pull request

The old version of testcontainers does not support Docker Compose v2, but currently, Docker Desktops in Windows/mac use v2, which causes local e2e runs to fail. Please refer to the specific issue for details
testcontainers/testcontainers-java#1481
Update the testcontainers version for e2e testing and use the new API
testcontainers/testcontainers-java#5608

Brief change log

Verify this pull request

This pull request is code cleanup without any test coverage.

(or)

This pull request is already covered by existing tests, such as (please describe tests).

(or)

This change added tests and can be verified as follows:

(or)

If your pull request contain incompatible change, you should also add it to docs/docs/en/guide/upgrede/incompatible.md

@github-actions github-actions bot added the e2e e2e test label Dec 15, 2023
@jackyyyyyssss jackyyyyyssss changed the title [Improvement][E2E] support e2e compose v2 fix code stystle [Improvement][E2E] support e2e compose v2 fix code style Dec 15, 2023
@codecov-commenter
Copy link

codecov-commenter commented Dec 15, 2023 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (c849501) 37.81% compared to head (9f7a282) 37.80%.

❗ Current head 9f7a282 differs from pull request most recent head f433ae0. Consider uploading reports for the commit f433ae0 to get more accurate results

Additional details and impacted files 
@@             Coverage Diff              @@
##                dev   #15325      +/-   ##
============================================
- Coverage     37.81%   37.80%   -0.01%     
+ Complexity     4682     4680       -2     
============================================
  Files          1304     1304              
  Lines         44937    44937              
  Branches       4812     4812              
============================================
- Hits          16991    16989       -2     
  Misses        26098    26098              
- Partials       1848     1850       +2

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

@jackyyyyyssss
Copy link
Contributor Author

jackyyyyyssss commented Dec 15, 2023

image
image
These errors don't seem to be within my scope of modification this time

SbloodyS
SbloodyS requested changes Dec 15, 2023
View reviewed changes
@SbloodyS SbloodyS added the first time contributor First-time contributor label Dec 15, 2023
@jackyyyyyssss
Copy link
Contributor Author

jackyyyyyssss commented Dec 15, 2023 •
edited
Loading

@SbloodyS Thank you for your review. The reason for my formatting change is that the e2e module did not introduce mvn spotless : apply

So I introduced the same rules as the main module locally to run the formatting code and fix the previous format irregularities. I have restored it to see if it is necessary to introduce mvn spotless in the e2e module to maintain consistency with the main module？

@ruanwenjun ruanwenjun added the improvement make more easy to user or prompt friendly label Dec 17, 2023
@ruanwenjun
Copy link
Member

ruanwenjun commented Dec 17, 2023

We also need to update testcontainer version in dolphinscheduler-bom

@q3356564
Revert "fix version"
02fe4aa 
This reverts commit 4f1c196
@github-actions github-actions bot removed the backend label Dec 18, 2023
@jackyyyyyssss
Copy link
Contributor Author

jackyyyyyssss commented Dec 18, 2023

We also need to update testcontainer version in dolphinscheduler-bom

done @ruanwenjun PTAL

@jackyyyyyssss
Copy link
Contributor Author

jackyyyyyssss commented Dec 21, 2023

@SbloodyS PTAL

SbloodyS
SbloodyS previously approved these changes Dec 27, 2023
View reviewed changes
Copy link
Member

@SbloodyS SbloodyS left a comment

Choose a reason for hiding this comment

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

Generally LGTM. Just some NIT.

@SbloodyS SbloodyS added this to the 3.3.0 milestone Dec 27, 2023
@SbloodyS SbloodyS added the 3.3.0 label Dec 27, 2023
@sonarqubecloud
Copy link

sonarqubecloud bot commented Dec 27, 2023

Quality Gate Passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

@SbloodyS SbloodyS merged commit 74fd24b into apache:dev Dec 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SbloodyS SbloodyS SbloodyS approved these changes

@caishunfeng caishunfeng Awaiting requested review from caishunfeng

@ruanwenjun ruanwenjun Awaiting requested review from ruanwenjun ruanwenjun is a code owner

Assignees

@jackyyyyyssss jackyyyyyssss

Labels

3.3.0 e2e e2e test first time contributor First-time contributor improvement make more easy to user or prompt friendly ready-to-merge

Projects

None yet

Milestone

3.3.0-alpha

Development

Successfully merging this pull request may close these issues.

7 participants

@jackyyyyyssss @codecov-commenter @ruanwenjun @SbloodyS @q3356564 @davidzollo @qE0a44OX6s