JDK_BRANCH passed to tests does match --disable-adopt-branch-safety -b branch

[AdamBrousseau]

What are you trying to do?

Build & Test with a custom openjdk repo/branch.

Expected behaviour:

Pass custom branch via jdkXX_pipeline_config buildArgs --disable-adopt-branch-safety -r <repo> -b <branch>. Compile clones and checks out the correct branch. Correct repo & branch are passed to test jobs.

Observed behaviour:

Default branch (openj9) is passed to test instead of custom branch value.

Any other comments:

[M-Davies]

Default branch (openj9) is passed to test instead of custom branch value.

Is the correct branch is passed to the build script (i.e. make-jdk-any-platform.sh)?

[AdamBrousseau]

Yes, I assume so. The compile uses the right branch.

[M-Davies]

I think this is more a ci-jenkins problem as opposed to a openjdk-build problem as the -r <repo> -b <branch> values are specific to the build process (testing is handled by this function).

As such, this is more of an enhancement as we cannot currently modify the default hard coded values for the JDK_REPO but we can for JDK_BRANCH by using the scmReference parameter:

@AdamBrousseau Can you try and specify a different branch using this parameter and let me know if that works for you? If you also require access to further modification of the JDK_REPO param so you can pass in your own custom repository location, let me know and I'll look into implementing that for you

[AdamBrousseau]

more a ci-jenkins problem

Agree, not sure why I opened against build tbh.

So, just trying to figure out if my build is in a "state of unknown". Originally I was overwriting the places where the repo is hardcoded and replacing it with my repo. I was having issues with that method. At one point I also tried to use scmReference which didn't work because that branch gets used not only for the ext repo but also the OpenJ9 repo.
So now I'm using --disable-adopt-branch-safety and I'm pretty sure I've removed all the hardcoded overrides I once had but somehow the ext repo is passed to Test correctly (defined in -r) but the branch is passed as the default one.

Also want to say, this is probably a minor issue since it is my understanding that it would be highly unlikely I would have a diff on test material between my -b branch and whatever is in default openj9.

[M-Davies]

Ok so thanks to the help from @smlambert I think I have figured out what needs to be done to these sections of code:
https://github.com/AdoptOpenJDK/ci-jenkins-pipelines/blob/a035e1ae6e1aa663282e59a42a4636125eb9e672/pipelines/build/common/openjdk_build_pipeline.groovy#L174-L202
https://github.com/AdoptOpenJDK/ci-jenkins-pipelines/blob/a035e1ae6e1aa663282e59a42a4636125eb9e672/pipelines/build/common/openjdk_build_pipeline.groovy#L248-L250
jdkRepo is the ext brance, openj9Branch is the openj9 branch. If I am reading this right, to get a custom openj9 branch that is separate to the ext repo branch is not possible with the current code (they will both use buildConfig.SCM_REF). We will need to figure out a way to either expand this parameter to be mappable while retaining the current easy functionality:

{ "openj9Branch" : "master", "extentionsBranch" : "openj9" }

or allow for the plugging in of branch names from config files