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

Archive the test image for after the fact testing. #1251

Merged
merged 1 commit into from
Sep 6, 2019

Conversation

jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Aug 27, 2019

Closes #248

@jerboaa
Copy link
Contributor Author

jerboaa commented Aug 27, 2019

I'm still trying to figure out how I can test this PR before merging. Hence, the WIP :)

@adoptopenjdk-github-bot
Copy link
Contributor

Can one of the admins verify this patch?

@smlambert
Copy link
Contributor

In past, we have hijacked existing build jobs, and pointed it to the working branch, jerboaa:testimages, to test, I am happy to set that up to verify this if no one opposes.

@jerboaa
Copy link
Contributor Author

jerboaa commented Aug 27, 2019

In past, we have hijacked existing build jobs, and pointed it to the working branch, jerboaa:testimages, to test, I am happy to set that up to verify this if no one opposes.

Ugh, sounds ugly. But I suppose better than not testing it at all :) Thanks for your help getting this set up.

@johnoliver
Copy link
Contributor

run tests

@johnoliver
Copy link
Contributor

https://ci.adoptopenjdk.net/job/build-scripts-pr-tester/job/build-test/job/jobs/job/jdk11u/job/jdk11u-linux-x64-hotspot/131/console

Note that the build-scripts-pr-tester will probably not do entirely what you need atm as they do not run tests, but could enable tests on them temporarily to test your stuff. However they do show up your initial error.

FYI the initial problem you have is that unfortunately you have to declare the members of the BUILD_CONFIG array, unfortunately its not just a map you can throw things in. I.e add TEST_IMAGE_PATH to https://github.com/AdoptOpenJDK/openjdk-build/blob/master/sbin/common/config_init.sh#L78

@jerboaa
Copy link
Contributor Author

jerboaa commented Sep 2, 2019

@johnoliver Thanks for the pointers. Should be fixed now. Could you please retrigger a test?

@karianna karianna added this to the September 2019 milestone Sep 2, 2019
@karianna karianna added the enhancement Issues that enhance the code or documentation of the repo in any way label Sep 2, 2019
@johnoliver
Copy link
Contributor

run tests

@jerboaa
Copy link
Contributor Author

jerboaa commented Sep 3, 2019

Previous run failed on JDK 8 with:

/home/jenkins/workspace/build-scripts-pr-tester/build-test/jobs/jdk8u/jdk8u-linux-x64-hotspot/sbin/build.sh: line 532: BUILD_CONFIG[TEST_IMAGE_PATH]: unbound variable

Otherwise, testimage tar.gz archives get created as expected.

@johnoliver
Copy link
Contributor

run tests

@jerboaa
Copy link
Contributor Author

jerboaa commented Sep 3, 2019

run tests

@jerboaa jerboaa changed the title [WIP] Archive the test image for after the fact testing. Archive the test image for after the fact testing. Sep 3, 2019
@jerboaa
Copy link
Contributor Author

jerboaa commented Sep 3, 2019

This now seems to work correctly. Latest test-run:

https://ci.adoptopenjdk.net/job/build-scripts-pr-tester/job/openjdk-build-pr-tester/164/

Please review!

@@ -356,6 +356,8 @@ class Build {
def type = "jdk"
if (file.contains("-jre")) {
type = "jre"
} else if (file.contains("-testimage")) {
Copy link
Contributor Author

@jerboaa jerboaa Sep 3, 2019

Choose a reason for hiding this comment

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

@jerboaa
Copy link
Contributor Author

jerboaa commented Sep 4, 2019

https://ci.adoptopenjdk.net/job/build-scripts-pr-tester/job/openjdk-build-pr-tester/164/

FWIW, that build passed.

@johnoliver @karianna I'd appreciate a review when you get a chance.

@smlambert
Copy link
Contributor

The change looks good, and works from test perspective.

There is one codacy suggestion (https://app.codacy.com/app/AdoptOpenJDK/openjdk-build/pullRequest?prid=4071457) on this PR. Does the suggestion make sense for you to apply?

@jerboaa
Copy link
Contributor Author

jerboaa commented Sep 6, 2019

run tests

@jerboaa
Copy link
Contributor Author

jerboaa commented Sep 6, 2019

The change looks good, and works from test perspective.

Thanks for the review!

There is one codacy suggestion (https://app.codacy.com/app/AdoptOpenJDK/openjdk-build/pullRequest?prid=4071457) on this PR. Does the suggestion make sense for you to apply?

Trying that now. I hope old bash versions (3.x?) understand this syntax.

@jerboaa
Copy link
Contributor Author

jerboaa commented Sep 6, 2019

@smlambert Should be all set now. More thoughts?

@karianna karianna merged commit 22ce6f1 into adoptium:master Sep 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Issues that enhance the code or documentation of the repo in any way
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Openjdk 11+ build need also build test-image
5 participants