Update hardcoded JDK next values (adoptium#1574)

adoptium#1514 Signed-off-by: Shishir Halaharvi <[email protected]>
M-Davies · May 27, 2020 · 7b3fd1e · 7b3fd1e
1 parent beeb3f4
commit 7b3fd1e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/pipelines/build/common/build_base_file.groovy b/pipelines/build/common/build_base_file.groovy
@@ -208,8 +208,13 @@ class Builder implements Serializable {
         if (matcher.matches()) {
             return Integer.parseInt(matcher.group('version'))
         } else if ("jdk".equalsIgnoreCase(javaToBuild.trim())) {
-            // This needs to get updated when JDK HEAD version updates
-            return Integer.valueOf("15")
+            String javaFeatureVersion = System.getenv("JAVA_FEATURE_VERSION")
+            if (javaFeatureVersion) {
+                return Integer.valueOf(javaFeatureVersion)
+            } else {
+                context.error("Environment variable JAVA_FEATURE_VERSION not set")
+                throw new Exception()
+            }
         } else {
             context.error("Failed to read java version '${javaToBuild}'")
             throw new Exception()

diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy
@@ -62,8 +62,13 @@ class Build {
         if (matcher.matches()) {
             return Integer.parseInt(matcher.group('version'))
         } else if ("jdk".equalsIgnoreCase(javaToBuild.trim())) {
-            // This needs to get updated when JDK HEAD version updates
-            return Integer.valueOf("15")
+            String javaFeatureVersion = System.getenv("JAVA_FEATURE_VERSION")
+            if (javaFeatureVersion) {
+                return Integer.valueOf(javaFeatureVersion)
+            } else {
+                context.error("Environment variable JAVA_FEATURE_VERSION not set")
+                throw new Exception()
+            }
         } else {
             context.error("Failed to read java version '${javaToBuild}'")
             throw new Exception()