-
-
Notifications
You must be signed in to change notification settings - Fork 251
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
Enhance SBOM and JDK file check #4078
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
One question, did you intend to lose the indentation within the ifndef blocks of the .mk file?
SBOM_FILE := $(TEST_ROOT)/../jdkbinary/$(SBOM_FILE) | ||
SBOM_FILE := $(shell ls $(TEST_ROOT)/../jdkbinary/ | grep "sbom" | grep -v "metadata") | ||
ifeq ($(strip $(SBOM_FILE)),) | ||
$(error ERROR! NO SBOM_FILE AVAILABLE) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
whitespace probably needs fixing
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://ci.adoptium.net/job/Test_openjdk21_hs_special.system_x86-64_windows/26/console
I was expecting that link to be a re-run with the fix that showed the fix, but that is my original failing job link :-)
I guess it's not easy to run a re-test with an updated openjdk-build repo, so we can integrate this and then I can run the test against it again
Since it's been flagged by the other two above, I think it's worth fixing the whitespace issues (Blocking for now in case someone else merges this before you see the comments)
https://ci.adoptium.net/job/Test_openjdk21_hs_special.system_x86-64_windows/26/console is using my personal branch. @sxa |
https://ci.adoptium.net/view/Test_grinder/job/Grinder/11936/console This failure in makefile will fail the job and hence no other tests in same level will run and no test output will be archived. Currently no other tests in special.system, but it's not a good solution. Change it to draft. |
Ah yes - I hadn't looked at
but that doesn't appear. We only get:
(Maybe it was changed since you ran the job). But LGTM now - thanks for the fix, but I agree on your last comment that it would be good for it to fail in a different way if possible. |
1774f39
to
d7046cd
Compare
Updated. Print ERROR message and usage infor. |
Signed-off-by: Sophia Guo <[email protected]>
Signed-off-by: Sophia Guo <[email protected]>
Signed-off-by: Sophia Guo <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated. Print ERROR message and usage infor. https://ci.adoptium.net/job/Grinder/11939/
Just a minor point - it might be nicer if the error was inside the Running test
block, but otherwise this LGTM and I'm fine with it going in like this!
15:12:19 ERROR! NO SBOM_FILE AVAILABLE
15:12:19
15:12:19 ===============================================
15:12:19 Running test Rebuild_Same_JDK_Reproducibility_Test_win_0 ...
15:12:19 ===============================================
Inside the running test: it shows the usage of windows_repro_build_compare.sh information, which means parameters are missing.
|
Fixes #4079
If no SBOM and JDK file available fail the job.
Related #4079