Browse Source

Merge "Do not ignore global-settings-type in Maven module"

tags/2.10.0
Zuul 4 months ago
parent
commit
5bdefb7d13

+ 1
- 1
jenkins_jobs/modules/helpers.py View File

@@ -155,7 +155,7 @@ def config_file_provider_settings(xml_parent, data):
155 155
     if 'global-settings' in data:
156 156
         # Support for Config File Provider
157 157
         global_settings_file = str(data['global-settings'])
158
-        global_settings_type = data.get('settings-type', 'file')
158
+        global_settings_type = data.get('global-settings-type', 'file')
159 159
 
160 160
         # For cfp versions <2.10.0 we are able to detect cfp via the config
161 161
         # settings name.

+ 33
- 0
tests/general/fixtures/project-maven-global-settings-type.xml View File

@@ -0,0 +1,33 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<maven2-moduleset>
3
+  <goals>deploy</goals>
4
+  <ignoreUpstremChanges>true</ignoreUpstremChanges>
5
+  <rootPOM>pom.xml</rootPOM>
6
+  <aggregatorStyleBuild>true</aggregatorStyleBuild>
7
+  <incrementalBuild>false</incrementalBuild>
8
+  <siteArchivingDisabled>false</siteArchivingDisabled>
9
+  <fingerprintingDisabled>false</fingerprintingDisabled>
10
+  <archivingDisabled>false</archivingDisabled>
11
+  <resolveDependencies>false</resolveDependencies>
12
+  <processPlugins>false</processPlugins>
13
+  <mavenValidationLevel>-1</mavenValidationLevel>
14
+  <runHeadless>false</runHeadless>
15
+  <disableTriggerDownstreamProjects>false</disableTriggerDownstreamProjects>
16
+  <settings class="jenkins.mvn.FilePathSettingsProvider">
17
+    <path>test</path>
18
+  </settings>
19
+  <globalSettings class="org.jenkinsci.plugins.configfiles.maven.job.MvnGlobalSettingsProvider">
20
+    <settingsConfigId>test</settingsConfigId>
21
+  </globalSettings>
22
+  <runPostStepsIfResult>
23
+    <name>FAILURE</name>
24
+    <ordinal>2</ordinal>
25
+    <color>RED</color>
26
+  </runPostStepsIfResult>
27
+  <actions/>
28
+  <keepDependencies>false</keepDependencies>
29
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
30
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
31
+  <concurrentBuild>false</concurrentBuild>
32
+  <canRoam>true</canRoam>
33
+</maven2-moduleset>

+ 7
- 0
tests/general/fixtures/project-maven-global-settings-type.yaml View File

@@ -0,0 +1,7 @@
1
+project-type: maven
2
+maven:
3
+  goals: deploy
4
+  settings-type: file
5
+  settings: test
6
+  global-settings-type: cfp
7
+  global-settings: test

Loading…
Cancel
Save