This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch feature/SLING-7245
in repository https://gitbox.apache.org/repos/asf/sling-tooling-jenkins.git

commit 801e21bb2e14c935b7b9d2512950b78dd83b6d8a
Author: Robert Munteanu <[email protected]>
AuthorDate: Tue Dec 18 00:06:06 2018 +0100

    SLING-7245 - Validate pull requests using Jenkins
    
    Copy any overrides from the jenkins key in .sling-module.json
---
 vars/slingOsgiBundleBuild.groovy | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/vars/slingOsgiBundleBuild.groovy b/vars/slingOsgiBundleBuild.groovy
index 9bc9b45..b39eae9 100644
--- a/vars/slingOsgiBundleBuild.groovy
+++ b/vars/slingOsgiBundleBuild.groovy
@@ -29,10 +29,11 @@ def call(Map params = [:]) {
             if ( fileExists('.sling-module.json') ) {
                 overrides = readJSON file: '.sling-module.json'
                 echo "Jenkins overrides: ${overrides.jenkins}"
-                if ( overrides.jenkins?.jdks ) {
-                    buildDesc.jdks = overrides.jenkins.jdks
+                overrides.jenkins.each { entry ->
+                    buildDesc[entry] = entry;
                 }
             }
+            echo "Final build config: ${buildDesc}"
         }
 
         deploy = true

Reply via email to