Merge pull request #148 from jglick/jdk

JDK version parameters in `buildPlugin()` are supposed to be strings not integers
jenkins-infra · Jun 23, 2020 · 3382e5e · 3382e5e
2 parents 1dcc297 + e224f9f
commit 3382e5e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/test/groovy/BuildPluginStepTests.groovy b/test/groovy/BuildPluginStepTests.groovy
@@ -70,8 +70,8 @@ class BuildPluginStepTests extends BaseTest {
     def script = loadScript(scriptName)
     def configurations = script.getConfigurations([:])
 
-    def expected = [['platform': 'linux', 'jdk': 8, 'jenkins': null, 'javaLevel': null],
-                    ['platform': 'windows', 'jdk': 8, 'jenkins': null, 'javaLevel': null]]
+    def expected = [['platform': 'linux', 'jdk': '8', 'jenkins': null, 'javaLevel': null],
+                    ['platform': 'windows', 'jdk': '8', 'jenkins': null, 'javaLevel': null]]
     assertEquals(expected, configurations)
     printCallStack()
     assertJobStatusSuccess()

diff --git a/vars/buildPlugin.groovy b/vars/buildPlugin.groovy
@@ -242,7 +242,7 @@ List<Map<String, String>> getConfigurations(Map params) {
     if (explicit) return params.configurations
 
     def platforms = params.containsKey('platforms') ? params.platforms : ['linux', 'windows']
-    def jdkVersions = params.containsKey('jdkVersions') ? params.jdkVersions : [8]
+    def jdkVersions = params.containsKey('jdkVersions') ? params.jdkVersions : ['8']
     def jenkinsVersions = params.containsKey('jenkinsVersions') ? params.jenkinsVersions : [null]
 
     def ret = []