Pass patch number into installer job

[adamfarley]

Patch numbers have been added into the upstream build jobs for Windows,
but are not passed downstream, where it appears to prevent us from
finding the build in the installer job.

Signed-off-by: Adam Farley adfarley@redhat.com

[adamfarley]

Ok, I think this is the fix for the Windows installer issue seen here:

Step 1: Add "PRODUCT_BUILD_NUMBER" as a parameter for the create_windows_installer job.
Step 2: Replace all references to "PRODUCT_PATCH_VERSION" in the create_windows_installer job with "PRODUCT_BUILD_NUMBER"
Step 3: Change the create_windows_installer job so that we search for major.minor.maintenance.patch+build as the "fourth" step here:

J:\jenkins\workspace\build-scripts\release\create_installer_windows\wix>IF NOT "" == "true" 
Generate OpenJDK setup "hotspot" for "x64" platform "jdk"
****************************************************
First .\SourceDir\OpenJDK11\hotspot\x64\jdk-11.0.9 not exists
Second .\SourceDir\OpenJDK11\hotspot\x64\jdk-11+1 not exists
Third .\SourceDir\OpenJDK11\hotspot\x64\jdk-11.0.9+1 not exists

Step 4: Merge this PR

I don't have access to the installer job config, and I'm not seeing scripts for them, so I assume steps 1-3 will have to be done manually, inside the job, by someone with access.

Does that sound right?

EDIT: This is now:

Step 1: Add "PRODUCT_BUILD_NUMBER" as a parameter for the create_windows_installer job.

Step 2+3: Merge adoptium/installer#258

Step 4: Merge this PR.

[sxa]

Instead of renaming the existing ones we could just add PRODUCT_FIX_NUMBER to handle the "new" (usually empty!) number

[adamfarley]

This is true, though since Andrew's new variable inside Version Info is called "patch" (e.g. major.minor.(security|maintenance).patch+build), I was trying for consistency with the variable names.

I'm happy to set "consistency" aside for now if it poses a problem, or makes things significantly more difficult.

[adamfarley]

This PR is paired with adoptium/installer#258

Both should be merged at the same time, ideally when no Windows jobs are running.

[karianna]

@adamfarley should this still be WIP?

[karianna]

LGTM

[douph1]

It's good to see this kind if error fixed : PATCH != buildNumber

Where does the buildNumber come from ? Jenkins job build number ?

[andrew-m-leonard]

@douph1 Can we simply make this code: https://github.com/AdoptOpenJDK/openjdk-installer/blob/fe8c79d25551401db3cb06b3c7a72f013a56051c/wix/Build.OpenJDK_generic.cmd#L111
Query the folder: .\SourceDir!PRODUCT_SKU!!PRODUCT_MAJOR_VERSION!!PACKAGE_TYPE!!FOLDER_PLATFORM!\jdk-*
to work out what the jdk-* path is?

[adamfarley]

@douph1 Can we simply make this code: https://github.com/AdoptOpenJDK/openjdk-installer/blob/fe8c79d25551401db3cb06b3c7a72f013a56051c/wix/Build.OpenJDK_generic.cmd#L111
Query the folder: .\SourceDir!PRODUCT_SKU!!PRODUCT_MAJOR_VERSION!!PACKAGE_TYPE!!FOLDER_PLATFORM!\jdk-*
to work out what the jdk-* path is?

Good idea for a new PR, I think.

Right now I'm looking at the JDK8 issue.

P.S. https://github.com/AdoptOpenJDK/openjdk-build/pull/2219/files should go in before this change, so they merge properly.

[adamfarley]

JDK8 issue resolved.