-
-
Notifications
You must be signed in to change notification settings - Fork 314
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
Check testenv.properties JDKxx_BRANCH tags #5102
Conversation
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Various tests Grinder/8973 (JDK8, dev branch)
Grinder/8979 (JDK11, non-existent jdk-11.0.23-ga tag)
Grinder/8980 (JDK11, non-existent blahblah tag)
Grinder/8982 (JDK17, with JDK17_BRANCH=latestSHA)
because the SHA case needs work, shifting this PR to draft |
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
Grinder/8983 (JDK17 with JDK17_BRANCH=latestSHA)
Grinder fails later, as presumably, we do not handle the case for getting the OpenJDK test material for a particular commit SHA at present. So this may come in as a separate PR. |
Signed-off-by: Shelley Lambert <[email protected]>
Signed-off-by: Shelley Lambert <[email protected]>
From the console output, cmd for a branch is expected (see below). We need to update openjdk logic.
|
Given #5102 (comment), I will not worry about the SHA edge case for this PR. This PR does not break anything, since the functionality is not there. This PR does goes as far as identifying when we have a SHA which is good, and we can address the update to the logic in the openjdk/build.xml and openjdk.mk file in a subsequent PR. |
@ShelleyLambert just to double check the following scenario of
There is the output of |
This PR was created so that we will no longer need to manually update the testenv.properties file. One less step in release checklist! The bit of code below, which updates the contents of the testenv.properties call only gets called in a very specific case, it is called when all of the following criteria are met:
if $latestTag is not found, we do not write it to testenv.properties file, we exit / fail. You are correct that I should update the output message to state why in this case we are writing to the testenv.properties file when we said we would not be doing so, if USE_TESTENV_PROPERTIES=true. testenv.properties should contain the property values that were used in the test run. When USE_TESTENV_PROPERTIES=false, we grab the SHAs that were used and write them to the file. When USE_TESTENV_PROPERTIES=true and we find that the tag value does not exist, but we find a suitable fallback tag and proceed to use it, we need to capture that in the testenv.properties file. Let me see if I can improve the print message a bit. |
Signed-off-by: Shelley Lambert <[email protected]>
@sophia-guo - I have updated my output message, and can create a TKG pull request to change the wording of the other output message, which could read something like "USE_TESTENV_PROPERTIES was set, not overwriting the testenv.properties file with SHAs" |
Fixes #4373
Add a script to check the existence of testenv.properties tags for the JDKxx_BRANCH values when USE_TESTENV_PROPERTIES=true. If the value is a valid branch or tag name, then use it, otherwise get the latest tag and use that.
A second pass of this should be done to cover the case where the value in the testenv.properties files are SHAs (instead of branch or tag names).