Do not ignore global-settings-type in Maven module
settings-type parameter hides global-settings-type and makes it impossible to use settings from the file and ConfigFileProvider at the same time like: maven: settings-type: file settings: mvn/settings.xml global-settings-type: cfp global-settings: test Change-Id: Ieda05912ae8b28942d98150a51c92b2521f2b6bf Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
This commit is contained in:
parent
b1499530db
commit
bc55a673a0
@ -155,7 +155,7 @@ def config_file_provider_settings(xml_parent, data):
|
|||||||
if 'global-settings' in data:
|
if 'global-settings' in data:
|
||||||
# Support for Config File Provider
|
# Support for Config File Provider
|
||||||
global_settings_file = str(data['global-settings'])
|
global_settings_file = str(data['global-settings'])
|
||||||
global_settings_type = data.get('settings-type', 'file')
|
global_settings_type = data.get('global-settings-type', 'file')
|
||||||
|
|
||||||
# For cfp versions <2.10.0 we are able to detect cfp via the config
|
# For cfp versions <2.10.0 we are able to detect cfp via the config
|
||||||
# settings name.
|
# settings name.
|
||||||
|
@ -0,0 +1,33 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<maven2-moduleset>
|
||||||
|
<goals>deploy</goals>
|
||||||
|
<ignoreUpstremChanges>true</ignoreUpstremChanges>
|
||||||
|
<rootPOM>pom.xml</rootPOM>
|
||||||
|
<aggregatorStyleBuild>true</aggregatorStyleBuild>
|
||||||
|
<incrementalBuild>false</incrementalBuild>
|
||||||
|
<siteArchivingDisabled>false</siteArchivingDisabled>
|
||||||
|
<fingerprintingDisabled>false</fingerprintingDisabled>
|
||||||
|
<archivingDisabled>false</archivingDisabled>
|
||||||
|
<resolveDependencies>false</resolveDependencies>
|
||||||
|
<processPlugins>false</processPlugins>
|
||||||
|
<mavenValidationLevel>-1</mavenValidationLevel>
|
||||||
|
<runHeadless>false</runHeadless>
|
||||||
|
<disableTriggerDownstreamProjects>false</disableTriggerDownstreamProjects>
|
||||||
|
<settings class="jenkins.mvn.FilePathSettingsProvider">
|
||||||
|
<path>test</path>
|
||||||
|
</settings>
|
||||||
|
<globalSettings class="org.jenkinsci.plugins.configfiles.maven.job.MvnGlobalSettingsProvider">
|
||||||
|
<settingsConfigId>test</settingsConfigId>
|
||||||
|
</globalSettings>
|
||||||
|
<runPostStepsIfResult>
|
||||||
|
<name>FAILURE</name>
|
||||||
|
<ordinal>2</ordinal>
|
||||||
|
<color>RED</color>
|
||||||
|
</runPostStepsIfResult>
|
||||||
|
<actions/>
|
||||||
|
<keepDependencies>false</keepDependencies>
|
||||||
|
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
|
||||||
|
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
|
||||||
|
<concurrentBuild>false</concurrentBuild>
|
||||||
|
<canRoam>true</canRoam>
|
||||||
|
</maven2-moduleset>
|
@ -0,0 +1,7 @@
|
|||||||
|
project-type: maven
|
||||||
|
maven:
|
||||||
|
goals: deploy
|
||||||
|
settings-type: file
|
||||||
|
settings: test
|
||||||
|
global-settings-type: cfp
|
||||||
|
global-settings: test
|
Loading…
Reference in New Issue
Block a user