changeset 54751:5600f5c38b0b

8223464: Improve version string for Oracle CI builds Reviewed-by: tbell
author erikj
date Tue, 07 May 2019 14:05:09 -0700
parents 1851a532ddfe
children 3fbaea4b1f1c
files make/autoconf/version-numbers make/conf/jib-profiles.js
diffstat 2 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/make/autoconf/version-numbers	Tue May 07 13:33:27 2019 -0700
+++ b/make/autoconf/version-numbers	Tue May 07 14:05:09 2019 -0700
@@ -37,6 +37,7 @@
 DEFAULT_VERSION_CLASSFILE_MINOR=0
 DEFAULT_ACCEPTABLE_BOOT_VERSIONS="12 13"
 DEFAULT_JDK_SOURCE_TARGET_VERSION=13
+DEFAULT_PROMOTED_VERSION_PRE=ea
 
 LAUNCHER_NAME=openjdk
 PRODUCT_NAME=OpenJDK
--- a/make/conf/jib-profiles.js	Tue May 07 13:33:27 2019 -0700
+++ b/make/conf/jib-profiles.js	Tue May 07 14:05:09 2019 -0700
@@ -1301,10 +1301,16 @@
     var args = ["--with-version-build=" + common.build_number];
     if (input.build_type == "promoted") {
         args = concat(args,
-                      // This needs to be changed when we start building release candidates
-                      // with-version-pre must be set to ea for 'ea' and empty for fcs build
-                      "--with-version-pre=ea",
+                      "--with-version-pre=" + version_numbers.get("DEFAULT_PROMOTION_VERSION_PRE"),
                       "--without-version-opt");
+    } else if (input.build_type == "ci") {
+        var optString = input.build_id_data.ciBuildNumber;
+        var preString = input.build_id_data.projectName;
+        if (preString == "jdk") {
+            preString = version_numbers.get("DEFAULT_PROMOTED_VERSION_PRE");
+        }
+        args = concat(args, "--with-version-pre=" + preString,
+                     "--with-version-opt=" + optString);
     } else {
         args = concat(args, "--with-version-opt=" + common.build_id);
     }