Test Autogen: Reset JCK_GIT_REPO every loop #2425
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Could you resolve the conflicts? Thanks |
AdamBrousseau
force-pushed
the
autgen_jck_repo_version_fix
branch
from
2a902b8
to
6db5d13
Compare
|
Rebased, and cleaned up some whitespace. |
llxia
reviewed
Mar 30, 2021
| if (GROUP == "jck" && JCK_GIT_REPO_PREFIX && !JCK_GIT_REPO) { | ||
| JCK_GIT_REPO = "${JCK_GIT_REPO_PREFIX}/JCK${JDK_VERSION}-unzipped.git" | ||
| ACTUAL_JCK_GIT_REPO = "${JCK_GIT_REPO_PREFIX}/JCK${JDK_VERSION}-unzipped.git" |
There was a problem hiding this comment.
I think the original code supports two cases:
- the user provides
JCK_GIT_REPOrepo. The script uses it to generate test jobs - the user does not provide
JCK_GIT_REPOrepo. The script setsJCK_GIT_REPOto${JCK_GIT_REPO_PREFIX}/JCK${JDK_VERSION}-unzipped.git// this is ideal for running in a loop
Also, the change in this PR will cause user-provided JCK_GIT_REPO to be ignored.
There was a problem hiding this comment.
Good catch. I think I've fixed it now.
AdamBrousseau
force-pushed
the
autgen_jck_repo_version_fix
branch
from
6db5d13
to
b14233e
Compare
|
rebase required. |
Similar to what is done for ACTUAL_TEST_JOB_NAME, use and reset the ACTUAL_JCK_GIT_REPO every loop in order to hit the condition everytime. Otherwise JCK_GIT_REPO would be set on the first loop for the duration of the build. Signed-off-by: Adam Brousseau <[email protected]>
AdamBrousseau
force-pushed
the
autgen_jck_repo_version_fix
branch
from
b14233e
to
78ea06a
Compare
|
rebased |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Similar to what is done for ACTUAL_TEST_JOB_NAME,
use and reset the ACTUAL_JCK_GIT_REPO every loop in
order to hit the condition everytime. Otherwise
JCK_GIT_REPO would be set on the first loop for the
duration of the build.
Signed-off-by: Adam Brousseau [email protected]
@llxia for review
Tested internal Test_Job_Auto_Gen_Sandbox/104