From 6c55bc78212536a9fe59f35b4c199ebe2c305844 Mon Sep 17 00:00:00 2001
From: Ben Douglas <bedouglas@tripadvisor.com>
Date: Mon, 1 Jun 2020 16:05:41 -0400
Subject: Gradle plugin: Support parameter passing

Introduce 2 booleans in the Gradle builder section to support passing
parameters by System Properties and Project Properties

Change-Id: I0de1e20b85902263e0d83ccadd64d42fc2b37193
---
 jenkins_jobs/modules/builders.py    | 6 ++++++
 tests/builders/fixtures/gradle.xml  | 2 ++
 tests/builders/fixtures/gradle.yaml | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/jenkins_jobs/modules/builders.py b/jenkins_jobs/modules/builders.py
index e26f98bb..126afd95 100644
--- a/jenkins_jobs/modules/builders.py
+++ b/jenkins_jobs/modules/builders.py
@@ -1140,6 +1140,10 @@ def gradle(registry, xml_parent, data):
         root) here, such as ${workspace}/parent/ instead of just
         ${workspace}.
     :arg str build-file: name of gradle build script (default 'build.gradle')
+    :arg bool pass-system-properties: Pass all parameters as
+        System properties (default false)
+    :arg bool pass-project-properties: Pass all parameters as
+        Project properties (default false)
 
     Example:
 
@@ -1158,6 +1162,8 @@ def gradle(registry, xml_parent, data):
         ("wrapper", "useWrapper", False),
         ("executable", "makeExecutable", False),
         ("use-root-dir", "fromRootBuildScriptDir", False),
+        ("pass-system-properties", "passAllAsSystemProperties", False),
+        ("pass-project-properties", "passAllAsProjectProperties", False),
     ]
     helpers.convert_mapping_to_xml(gradle, data, mappings, fail_required=True)
 
diff --git a/tests/builders/fixtures/gradle.xml b/tests/builders/fixtures/gradle.xml
index 62a2d73d..e0d67638 100644
--- a/tests/builders/fixtures/gradle.xml
+++ b/tests/builders/fixtures/gradle.xml
@@ -13,6 +13,8 @@ tests
       <useWrapper>true</useWrapper>
       <makeExecutable>true</makeExecutable>
       <fromRootBuildScriptDir>true</fromRootBuildScriptDir>
+      <passAllAsSystemProperties>true</passAllAsSystemProperties>
+      <passAllAsProjectProperties>true</passAllAsProjectProperties>
       <switches>-g /foo/bar/.gradle
 -PmavenUserName=foobar</switches>
     </hudson.plugins.gradle.Gradle>
diff --git a/tests/builders/fixtures/gradle.yaml b/tests/builders/fixtures/gradle.yaml
index 793a4359..7a05a656 100644
--- a/tests/builders/fixtures/gradle.yaml
+++ b/tests/builders/fixtures/gradle.yaml
@@ -6,6 +6,8 @@ builders:
       executable: true
       use-root-dir: true
       root-build-script-dir: ${workspace}/tests
+      pass-system-properties: true
+      pass-project-properties: true
       switches:
         - "-g /foo/bar/.gradle"
         - "-PmavenUserName=foobar"
-- 
cgit