From dff7df4ef0ac494613844e493035587db9ab6a64 Mon Sep 17 00:00:00 2001 From: Andrea Scarpino Date: Tue, 26 Sep 2017 15:09:09 +0200 Subject: [PATCH] Maven project: allow to disable trigger downstream projects Change-Id: Ie4af949ad686f007d3091d947ef65c670262f8d4 --- jenkins_jobs/modules/project_maven.py | 4 ++++ tests/general/fixtures/project-maven001.xml | 1 + tests/general/fixtures/project-maven001.yaml | 1 + tests/general/fixtures/project-maven002.xml | 1 + tests/general/fixtures/project-maven003.xml | 1 + tests/general/fixtures/project-maven004.xml | 1 + 6 files changed, 9 insertions(+) diff --git a/jenkins_jobs/modules/project_maven.py b/jenkins_jobs/modules/project_maven.py index f8712d7e5..403a103f1 100755 --- a/jenkins_jobs/modules/project_maven.py +++ b/jenkins_jobs/modules/project_maven.py @@ -50,6 +50,8 @@ in the :ref:`Job` definition. * **resolve-dependencies** (`bool`): Resolve Dependencies during Pom parsing (default false). * **run-headless** (`bool`): Run headless (default false). + * **disable-downstream** (`bool`): Disable triggering of downstream + projects (default false). * **process-plugins** (`bool`): Process Plugins during Pom parsing (default false). * **custom-workspace** (`str`): Path to the custom workspace. If no path is @@ -164,6 +166,8 @@ class Maven(jenkins_jobs.modules.base.Base): XML.SubElement(xml_parent, 'mavenValidationLevel').text = '-1' XML.SubElement(xml_parent, 'runHeadless').text = str( data['maven'].get('run-headless', False)).lower() + XML.SubElement(xml_parent, 'disableTriggerDownstreamProjects').text = \ + str(data['maven'].get('disable-downstream', False)).lower() if 'custom-workspace' in data['maven']: XML.SubElement(xml_parent, 'customWorkspace').text = str( data['maven'].get('custom-workspace')) diff --git a/tests/general/fixtures/project-maven001.xml b/tests/general/fixtures/project-maven001.xml index db8eba827..8d87d7086 100644 --- a/tests/general/fixtures/project-maven001.xml +++ b/tests/general/fixtures/project-maven001.xml @@ -17,6 +17,7 @@ true -1 true + true path/to/some/repository test diff --git a/tests/general/fixtures/project-maven001.yaml b/tests/general/fixtures/project-maven001.yaml index 9c46e6e56..5c7de6700 100644 --- a/tests/general/fixtures/project-maven001.yaml +++ b/tests/general/fixtures/project-maven001.yaml @@ -14,4 +14,5 @@ maven: resolve-dependencies: true process-plugins: true run-headless: true + disable-downstream: true custom-workspace: path/to/some/repository diff --git a/tests/general/fixtures/project-maven002.xml b/tests/general/fixtures/project-maven002.xml index 2ea65b09f..45e1c8c3d 100644 --- a/tests/general/fixtures/project-maven002.xml +++ b/tests/general/fixtures/project-maven002.xml @@ -13,6 +13,7 @@ false -1 false + false diff --git a/tests/general/fixtures/project-maven003.xml b/tests/general/fixtures/project-maven003.xml index b52b5e0fc..0e1783bf4 100644 --- a/tests/general/fixtures/project-maven003.xml +++ b/tests/general/fixtures/project-maven003.xml @@ -12,6 +12,7 @@ false -1 false + false org.jenkinsci.plugins.configfiles.maven.MavenSettingsConfig0123456789012 diff --git a/tests/general/fixtures/project-maven004.xml b/tests/general/fixtures/project-maven004.xml index 1faa8421a..4ea784117 100644 --- a/tests/general/fixtures/project-maven004.xml +++ b/tests/general/fixtures/project-maven004.xml @@ -12,6 +12,7 @@ false -1 false + false test-settings