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

Do not move the test to child job if parallel list number=1 #5511

Merged
merged 1 commit into from
Aug 20, 2024

Conversation

sophia-guo
Copy link
Contributor

@sophia-guo sophia-guo commented Aug 16, 2024

Close #5375

@sophia-guo sophia-guo marked this pull request as draft August 16, 2024 19:27
@sophia-guo
Copy link
Contributor Author

sophia-guo commented Aug 16, 2024

https://ci.adoptium.net/job/Test_openjdk23_hs_special.system_x86-64_linux/12/ - no child job is triggered if the generated test list is equal = 1. child rerun job failure is expected, which can't set personal ADOPTOPENJDK_REPO #4585
https://ci.adoptium.net/view/Test_grinder/job/Grinder/10768/ - add TEST_TIME parameter to test this PR.

@sophia-guo sophia-guo force-pushed the rerun branch 2 times, most recently from 298a576 to 3165781 Compare August 17, 2024 04:36
@sophia-guo sophia-guo self-assigned this Aug 19, 2024
@sophia-guo sophia-guo marked this pull request as ready for review August 19, 2024 20:52
@@ -969,7 +973,10 @@ def testBuild() {
// prepare environment and compile test projects
if ((params.PARALLEL == "NodesByIterations" && NUM_MACHINES > 1)
|| (params.PARALLEL == "Dynamic" && (NUM_MACHINES > 1 || (params.TEST_TIME && !params.NUM_MACHINES)))) {
setupParallelEnv()
if (setupParallelEnv() == 1) {
// No need to run tests in parallel
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we want to echo here as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, it is echoed https://github.com/adoptium/aqa-tests/pull/5511/files#diff-21a56f751656da4e3e5abee13913f51a269d6eb43235bc16fc4be21ef70deaf2R260

16:32:34   Number of test list is 1, no need to run tests in child job.

@smlambert
Copy link
Contributor

thanks @sophia-guo - we have already branched for Sept release, could this also be cherrypicked to v1.0.3-release branch please.

@smlambert smlambert merged commit b67ec4a into adoptium:master Aug 20, 2024
2 checks passed
sophia-guo added a commit to sophia-guo/openjdk-tests that referenced this pull request Aug 20, 2024
smlambert pushed a commit that referenced this pull request Aug 20, 2024
@@ -315,7 +319,7 @@ def setupParallelEnv() {
if (create_jobs) {
parallel create_jobs
}

return NUM_LIST
Copy link
Contributor

Choose a reason for hiding this comment

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

The variable NUM_LIST is not visible here (it's confined to the scope where it's declared, which ends on line 265); our test builds are failing as a result:

00:15:35.923  Exception: groovy.lang.MissingPropertyException: No such property: NUM_LIST for class: Script1

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

Successfully merging this pull request may close these issues.

No need to trigger a child test job if job can be finished within the TEST_TIME.
4 participants