summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-06-11 01:47:13 +0000
committerGerrit Code Review <review@openstack.org>2018-06-11 01:47:13 +0000
commit97922e40468f46dd4a121b27d89e3a743ce2411b (patch)
tree784937f5ac939c7848ab938eef25ab7672f5127a
parenta3da86e5ae28737422b41847330447af6485569a (diff)
parentff2d631d1a3543d3e6ed28e38034b41acd57b7a0 (diff)
Merge "Add trigger-from-child-projects option."
-rw-r--r--jenkins_jobs/modules/publishers.py6
-rw-r--r--tests/publishers/fixtures/join-trigger001.xml2
-rw-r--r--tests/publishers/fixtures/join-trigger001.yaml1
-rw-r--r--tests/publishers/fixtures/trigger-parameterized-builds001.xml1
-rw-r--r--tests/publishers/fixtures/trigger-parameterized-builds002.xml1
-rw-r--r--tests/publishers/fixtures/trigger_parameterized_builds/parameter-override-ordering.xml2
-rw-r--r--tests/publishers/fixtures/trigger_parameterized_builds001.xml6
-rw-r--r--tests/publishers/fixtures/trigger_parameterized_builds002.xml3
-rw-r--r--tests/publishers/fixtures/trigger_parameterized_builds003.xml1
-rw-r--r--tests/publishers/fixtures/trigger_parameterized_builds004.xml1
-rw-r--r--tests/publishers/fixtures/trigger_parameterized_builds005.xml1
-rw-r--r--tests/yamlparser/fixtures/second_order_parameter_interpolation002.xml4
-rw-r--r--tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-001.xml6
-rw-r--r--tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-002.xml2
-rw-r--r--tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.xml83
-rw-r--r--tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.yaml36
16 files changed, 156 insertions, 0 deletions
diff --git a/jenkins_jobs/modules/publishers.py b/jenkins_jobs/modules/publishers.py
index 82a9cbe..00645b5 100644
--- a/jenkins_jobs/modules/publishers.py
+++ b/jenkins_jobs/modules/publishers.py
@@ -507,6 +507,8 @@ def trigger_parameterized_builds(registry, xml_parent, data):
507 if any of the property files are not found in the workspace. 507 if any of the property files are not found in the workspace.
508 Only valid when 'property-file' is specified. 508 Only valid when 'property-file' is specified.
509 (default 'False') 509 (default 'False')
510 :arg bool trigger-from-child-projects: Trigger build from child projects.
511 Used for matrix projects. (default 'False')
510 :arg bool use-matrix-child-files: Use files in workspaces of child 512 :arg bool use-matrix-child-files: Use files in workspaces of child
511 builds (default 'False') 513 builds (default 'False')
512 :arg str matrix-child-combination-filter: A Groovy expression to filter 514 :arg str matrix-child-combination-filter: A Groovy expression to filter
@@ -560,6 +562,10 @@ def trigger_parameterized_builds(registry, xml_parent, data):
560 562
561 condition = XML.SubElement(tconfig, 'condition') 563 condition = XML.SubElement(tconfig, 'condition')
562 condition.text = project_def.get('condition', 'ALWAYS') 564 condition.text = project_def.get('condition', 'ALWAYS')
565 trigger_from_child_projects = XML.SubElement(
566 tconfig, 'triggerFromChildProjects')
567 trigger_from_child_projects.text = str(
568 project_def.get('trigger-from-child-projects', False)).lower()
563 trigger_with_no_params = XML.SubElement(tconfig, 569 trigger_with_no_params = XML.SubElement(tconfig,
564 'triggerWithNoParameters') 570 'triggerWithNoParameters')
565 trigger_with_no_params.text = str( 571 trigger_with_no_params.text = str(
diff --git a/tests/publishers/fixtures/join-trigger001.xml b/tests/publishers/fixtures/join-trigger001.xml
index 511eb6b..6573728 100644
--- a/tests/publishers/fixtures/join-trigger001.xml
+++ b/tests/publishers/fixtures/join-trigger001.xml
@@ -12,6 +12,7 @@
12 </configs> 12 </configs>
13 <projects>archive</projects> 13 <projects>archive</projects>
14 <condition>ALWAYS</condition> 14 <condition>ALWAYS</condition>
15 <triggerFromChildProjects>true</triggerFromChildProjects>
15 <triggerWithNoParameters>true</triggerWithNoParameters> 16 <triggerWithNoParameters>true</triggerWithNoParameters>
16 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 17 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
17 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 18 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
@@ -20,6 +21,7 @@
20 </configs> 21 </configs>
21 <projects>cleanup</projects> 22 <projects>cleanup</projects>
22 <condition>ALWAYS</condition> 23 <condition>ALWAYS</condition>
24 <triggerFromChildProjects>false</triggerFromChildProjects>
23 <triggerWithNoParameters>false</triggerWithNoParameters> 25 <triggerWithNoParameters>false</triggerWithNoParameters>
24 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 26 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
25 </configs> 27 </configs>
diff --git a/tests/publishers/fixtures/join-trigger001.yaml b/tests/publishers/fixtures/join-trigger001.yaml
index 47d96a3..7f59147 100644
--- a/tests/publishers/fixtures/join-trigger001.yaml
+++ b/tests/publishers/fixtures/join-trigger001.yaml
@@ -8,6 +8,7 @@ publishers:
8 - trigger-parameterized-builds: 8 - trigger-parameterized-builds:
9 - project: archive 9 - project: archive
10 current-parameters: true 10 current-parameters: true
11 trigger-from-child-projects: true
11 trigger-with-no-params: true 12 trigger-with-no-params: true
12 - project: cleanup 13 - project: cleanup
13 current-parameters: true 14 current-parameters: true
diff --git a/tests/publishers/fixtures/trigger-parameterized-builds001.xml b/tests/publishers/fixtures/trigger-parameterized-builds001.xml
index ec3bc08..8d15a23 100644
--- a/tests/publishers/fixtures/trigger-parameterized-builds001.xml
+++ b/tests/publishers/fixtures/trigger-parameterized-builds001.xml
@@ -7,6 +7,7 @@
7 <configs class="java.util.Collections$EmptyList"/> 7 <configs class="java.util.Collections$EmptyList"/>
8 <projects>fixture</projects> 8 <projects>fixture</projects>
9 <condition>SUCCESS</condition> 9 <condition>SUCCESS</condition>
10 <triggerFromChildProjects>false</triggerFromChildProjects>
10 <triggerWithNoParameters>false</triggerWithNoParameters> 11 <triggerWithNoParameters>false</triggerWithNoParameters>
11 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 12 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
12 </configs> 13 </configs>
diff --git a/tests/publishers/fixtures/trigger-parameterized-builds002.xml b/tests/publishers/fixtures/trigger-parameterized-builds002.xml
index 6e664f3..2a54609 100644
--- a/tests/publishers/fixtures/trigger-parameterized-builds002.xml
+++ b/tests/publishers/fixtures/trigger-parameterized-builds002.xml
@@ -11,6 +11,7 @@
11 </configs> 11 </configs>
12 <projects>fixture</projects> 12 <projects>fixture</projects>
13 <condition>SUCCESS</condition> 13 <condition>SUCCESS</condition>
14 <triggerFromChildProjects>false</triggerFromChildProjects>
14 <triggerWithNoParameters>false</triggerWithNoParameters> 15 <triggerWithNoParameters>false</triggerWithNoParameters>
15 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 16 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
16 </configs> 17 </configs>
diff --git a/tests/publishers/fixtures/trigger_parameterized_builds/parameter-override-ordering.xml b/tests/publishers/fixtures/trigger_parameterized_builds/parameter-override-ordering.xml
index 9150e0a..291422a 100644
--- a/tests/publishers/fixtures/trigger_parameterized_builds/parameter-override-ordering.xml
+++ b/tests/publishers/fixtures/trigger_parameterized_builds/parameter-override-ordering.xml
@@ -16,6 +16,7 @@
16 </configs> 16 </configs>
17 <projects>another_job</projects> 17 <projects>another_job</projects>
18 <condition>ALWAYS</condition> 18 <condition>ALWAYS</condition>
19 <triggerFromChildProjects>false</triggerFromChildProjects>
19 <triggerWithNoParameters>false</triggerWithNoParameters> 20 <triggerWithNoParameters>false</triggerWithNoParameters>
20 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 21 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
21 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 22 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
@@ -31,6 +32,7 @@
31 </configs> 32 </configs>
32 <projects>yet_another_job</projects> 33 <projects>yet_another_job</projects>
33 <condition>ALWAYS</condition> 34 <condition>ALWAYS</condition>
35 <triggerFromChildProjects>false</triggerFromChildProjects>
34 <triggerWithNoParameters>false</triggerWithNoParameters> 36 <triggerWithNoParameters>false</triggerWithNoParameters>
35 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 37 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
36 </configs> 38 </configs>
diff --git a/tests/publishers/fixtures/trigger_parameterized_builds001.xml b/tests/publishers/fixtures/trigger_parameterized_builds001.xml
index 9802dba..6710ecb 100644
--- a/tests/publishers/fixtures/trigger_parameterized_builds001.xml
+++ b/tests/publishers/fixtures/trigger_parameterized_builds001.xml
@@ -13,6 +13,7 @@ bar=foo
13 </configs> 13 </configs>
14 <projects>other_job,foo,bar</projects> 14 <projects>other_job,foo,bar</projects>
15 <condition>ALWAYS</condition> 15 <condition>ALWAYS</condition>
16 <triggerFromChildProjects>false</triggerFromChildProjects>
16 <triggerWithNoParameters>false</triggerWithNoParameters> 17 <triggerWithNoParameters>false</triggerWithNoParameters>
17 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 18 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
18 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 19 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
@@ -30,6 +31,7 @@ bar=foo
30 </configs> 31 </configs>
31 <projects>other_job1, other_job2</projects> 32 <projects>other_job1, other_job2</projects>
32 <condition>ALWAYS</condition> 33 <condition>ALWAYS</condition>
34 <triggerFromChildProjects>false</triggerFromChildProjects>
33 <triggerWithNoParameters>false</triggerWithNoParameters> 35 <triggerWithNoParameters>false</triggerWithNoParameters>
34 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 36 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
35 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 37 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
@@ -46,6 +48,7 @@ bar=foo
46 </configs> 48 </configs>
47 <projects>yet_another_job</projects> 49 <projects>yet_another_job</projects>
48 <condition>ALWAYS</condition> 50 <condition>ALWAYS</condition>
51 <triggerFromChildProjects>false</triggerFromChildProjects>
49 <triggerWithNoParameters>false</triggerWithNoParameters> 52 <triggerWithNoParameters>false</triggerWithNoParameters>
50 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 53 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
51 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 54 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
@@ -57,6 +60,7 @@ bar=foo
57 </configs> 60 </configs>
58 <projects>yet_another_job_2</projects> 61 <projects>yet_another_job_2</projects>
59 <condition>ALWAYS</condition> 62 <condition>ALWAYS</condition>
63 <triggerFromChildProjects>false</triggerFromChildProjects>
60 <triggerWithNoParameters>false</triggerWithNoParameters> 64 <triggerWithNoParameters>false</triggerWithNoParameters>
61 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 65 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
62 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 66 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
@@ -68,6 +72,7 @@ bar=foo
68 </configs> 72 </configs>
69 <projects>yet_another_job_3</projects> 73 <projects>yet_another_job_3</projects>
70 <condition>ALWAYS</condition> 74 <condition>ALWAYS</condition>
75 <triggerFromChildProjects>false</triggerFromChildProjects>
71 <triggerWithNoParameters>false</triggerWithNoParameters> 76 <triggerWithNoParameters>false</triggerWithNoParameters>
72 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 77 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
73 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 78 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
@@ -77,6 +82,7 @@ bar=foo
77 </configs> 82 </configs>
78 <projects>test-project-same-node</projects> 83 <projects>test-project-same-node</projects>
79 <condition>ALWAYS</condition> 84 <condition>ALWAYS</condition>
85 <triggerFromChildProjects>false</triggerFromChildProjects>
80 <triggerWithNoParameters>false</triggerWithNoParameters> 86 <triggerWithNoParameters>false</triggerWithNoParameters>
81 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 87 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
82 </configs> 88 </configs>
diff --git a/tests/publishers/fixtures/trigger_parameterized_builds002.xml b/tests/publishers/fixtures/trigger_parameterized_builds002.xml
index 9034db6..d258afc 100644
--- a/tests/publishers/fixtures/trigger_parameterized_builds002.xml
+++ b/tests/publishers/fixtures/trigger_parameterized_builds002.xml
@@ -12,6 +12,7 @@
12 </configs> 12 </configs>
13 <projects>test-project-all</projects> 13 <projects>test-project-all</projects>
14 <condition>ALWAYS</condition> 14 <condition>ALWAYS</condition>
15 <triggerFromChildProjects>false</triggerFromChildProjects>
15 <triggerWithNoParameters>false</triggerWithNoParameters> 16 <triggerWithNoParameters>false</triggerWithNoParameters>
16 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 17 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
17 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 18 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
@@ -23,6 +24,7 @@
23 </configs> 24 </configs>
24 <projects>test-project-just-name</projects> 25 <projects>test-project-just-name</projects>
25 <condition>ALWAYS</condition> 26 <condition>ALWAYS</condition>
27 <triggerFromChildProjects>false</triggerFromChildProjects>
26 <triggerWithNoParameters>false</triggerWithNoParameters> 28 <triggerWithNoParameters>false</triggerWithNoParameters>
27 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 29 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
28 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 30 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
@@ -34,6 +36,7 @@
34 </configs> 36 </configs>
35 <projects>test-project-just-node</projects> 37 <projects>test-project-just-node</projects>
36 <condition>ALWAYS</condition> 38 <condition>ALWAYS</condition>
39 <triggerFromChildProjects>false</triggerFromChildProjects>
37 <triggerWithNoParameters>false</triggerWithNoParameters> 40 <triggerWithNoParameters>false</triggerWithNoParameters>
38 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 41 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
39 </configs> 42 </configs>
diff --git a/tests/publishers/fixtures/trigger_parameterized_builds003.xml b/tests/publishers/fixtures/trigger_parameterized_builds003.xml
index e4dc920..2de23e4 100644
--- a/tests/publishers/fixtures/trigger_parameterized_builds003.xml
+++ b/tests/publishers/fixtures/trigger_parameterized_builds003.xml
@@ -31,6 +31,7 @@
31 </configs> 31 </configs>
32 <projects>other_job,foo,bar</projects> 32 <projects>other_job,foo,bar</projects>
33 <condition>ALWAYS</condition> 33 <condition>ALWAYS</condition>
34 <triggerFromChildProjects>false</triggerFromChildProjects>
34 <triggerWithNoParameters>false</triggerWithNoParameters> 35 <triggerWithNoParameters>false</triggerWithNoParameters>
35 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 36 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
36 </configs> 37 </configs>
diff --git a/tests/publishers/fixtures/trigger_parameterized_builds004.xml b/tests/publishers/fixtures/trigger_parameterized_builds004.xml
index ae24192..a37dc70 100644
--- a/tests/publishers/fixtures/trigger_parameterized_builds004.xml
+++ b/tests/publishers/fixtures/trigger_parameterized_builds004.xml
@@ -15,6 +15,7 @@
15 </configs> 15 </configs>
16 <projects>other_job</projects> 16 <projects>other_job</projects>
17 <condition>ALWAYS</condition> 17 <condition>ALWAYS</condition>
18 <triggerFromChildProjects>false</triggerFromChildProjects>
18 <triggerWithNoParameters>false</triggerWithNoParameters> 19 <triggerWithNoParameters>false</triggerWithNoParameters>
19 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 20 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
20 </configs> 21 </configs>
diff --git a/tests/publishers/fixtures/trigger_parameterized_builds005.xml b/tests/publishers/fixtures/trigger_parameterized_builds005.xml
index 27c113c..e556d98 100644
--- a/tests/publishers/fixtures/trigger_parameterized_builds005.xml
+++ b/tests/publishers/fixtures/trigger_parameterized_builds005.xml
@@ -15,6 +15,7 @@
15 </configs> 15 </configs>
16 <projects>other_job</projects> 16 <projects>other_job</projects>
17 <condition>ALWAYS</condition> 17 <condition>ALWAYS</condition>
18 <triggerFromChildProjects>false</triggerFromChildProjects>
18 <triggerWithNoParameters>false</triggerWithNoParameters> 19 <triggerWithNoParameters>false</triggerWithNoParameters>
19 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 20 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
20 </configs> 21 </configs>
diff --git a/tests/yamlparser/fixtures/second_order_parameter_interpolation002.xml b/tests/yamlparser/fixtures/second_order_parameter_interpolation002.xml
index bdab430..8323411 100644
--- a/tests/yamlparser/fixtures/second_order_parameter_interpolation002.xml
+++ b/tests/yamlparser/fixtures/second_order_parameter_interpolation002.xml
@@ -22,6 +22,7 @@
22 </configs> 22 </configs>
23 <projects/> 23 <projects/>
24 <condition>ALWAYS</condition> 24 <condition>ALWAYS</condition>
25 <triggerFromChildProjects>false</triggerFromChildProjects>
25 <triggerWithNoParameters>false</triggerWithNoParameters> 26 <triggerWithNoParameters>false</triggerWithNoParameters>
26 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 27 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
27 </configs> 28 </configs>
@@ -54,6 +55,7 @@
54 </configs> 55 </configs>
55 <projects>experimental_p2_bar</projects> 56 <projects>experimental_p2_bar</projects>
56 <condition>ALWAYS</condition> 57 <condition>ALWAYS</condition>
58 <triggerFromChildProjects>false</triggerFromChildProjects>
57 <triggerWithNoParameters>false</triggerWithNoParameters> 59 <triggerWithNoParameters>false</triggerWithNoParameters>
58 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 60 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
59 </configs> 61 </configs>
@@ -86,6 +88,7 @@
86 </configs> 88 </configs>
87 <projects>production_p1_foo</projects> 89 <projects>production_p1_foo</projects>
88 <condition>ALWAYS</condition> 90 <condition>ALWAYS</condition>
91 <triggerFromChildProjects>false</triggerFromChildProjects>
89 <triggerWithNoParameters>false</triggerWithNoParameters> 92 <triggerWithNoParameters>false</triggerWithNoParameters>
90 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 93 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
91 </configs> 94 </configs>
@@ -118,6 +121,7 @@
118 </configs> 121 </configs>
119 <projects/> 122 <projects/>
120 <condition>ALWAYS</condition> 123 <condition>ALWAYS</condition>
124 <triggerFromChildProjects>false</triggerFromChildProjects>
121 <triggerWithNoParameters>false</triggerWithNoParameters> 125 <triggerWithNoParameters>false</triggerWithNoParameters>
122 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 126 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
123 </configs> 127 </configs>
diff --git a/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-001.xml b/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-001.xml
index eb59f2f..03996fe 100644
--- a/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-001.xml
+++ b/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-001.xml
@@ -33,6 +33,7 @@ print(&quot;Doing something cool with python&quot;)
33 </configs> 33 </configs>
34 <projects>default_job</projects> 34 <projects>default_job</projects>
35 <condition>ALWAYS</condition> 35 <condition>ALWAYS</condition>
36 <triggerFromChildProjects>false</triggerFromChildProjects>
36 <triggerWithNoParameters>false</triggerWithNoParameters> 37 <triggerWithNoParameters>false</triggerWithNoParameters>
37 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 38 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
38 </configs> 39 </configs>
@@ -52,6 +53,7 @@ print(&quot;Doing something cool with python&quot;)
52 </configs> 53 </configs>
53 <projects>first_job</projects> 54 <projects>first_job</projects>
54 <condition>ALWAYS</condition> 55 <condition>ALWAYS</condition>
56 <triggerFromChildProjects>false</triggerFromChildProjects>
55 <triggerWithNoParameters>false</triggerWithNoParameters> 57 <triggerWithNoParameters>false</triggerWithNoParameters>
56 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 58 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
57 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 59 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
@@ -67,6 +69,7 @@ print(&quot;Doing something cool with python&quot;)
67 </configs> 69 </configs>
68 <projects>second_job</projects> 70 <projects>second_job</projects>
69 <condition>ALWAYS</condition> 71 <condition>ALWAYS</condition>
72 <triggerFromChildProjects>false</triggerFromChildProjects>
70 <triggerWithNoParameters>false</triggerWithNoParameters> 73 <triggerWithNoParameters>false</triggerWithNoParameters>
71 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 74 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
72 </configs> 75 </configs>
@@ -110,6 +113,7 @@ print(&quot;Doing something cool with python&quot;)
110 </configs> 113 </configs>
111 <projects>default_job</projects> 114 <projects>default_job</projects>
112 <condition>ALWAYS</condition> 115 <condition>ALWAYS</condition>
116 <triggerFromChildProjects>false</triggerFromChildProjects>
113 <triggerWithNoParameters>false</triggerWithNoParameters> 117 <triggerWithNoParameters>false</triggerWithNoParameters>
114 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 118 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
115 </configs> 119 </configs>
@@ -129,6 +133,7 @@ print(&quot;Doing something cool with python&quot;)
129 </configs> 133 </configs>
130 <projects>1.2_first_job</projects> 134 <projects>1.2_first_job</projects>
131 <condition>ALWAYS</condition> 135 <condition>ALWAYS</condition>
136 <triggerFromChildProjects>false</triggerFromChildProjects>
132 <triggerWithNoParameters>false</triggerWithNoParameters> 137 <triggerWithNoParameters>false</triggerWithNoParameters>
133 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 138 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
134 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 139 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
@@ -144,6 +149,7 @@ print(&quot;Doing something cool with python&quot;)
144 </configs> 149 </configs>
145 <projects>1.2_second_job</projects> 150 <projects>1.2_second_job</projects>
146 <condition>ALWAYS</condition> 151 <condition>ALWAYS</condition>
152 <triggerFromChildProjects>false</triggerFromChildProjects>
147 <triggerWithNoParameters>false</triggerWithNoParameters> 153 <triggerWithNoParameters>false</triggerWithNoParameters>
148 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 154 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
149 </configs> 155 </configs>
diff --git a/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-002.xml b/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-002.xml
index a6f5c44..95f46d1 100644
--- a/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-002.xml
+++ b/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-002.xml
@@ -30,6 +30,7 @@
30 </configs> 30 </configs>
31 <projects/> 31 <projects/>
32 <condition>UNSTABLE_OR_BETTER</condition> 32 <condition>UNSTABLE_OR_BETTER</condition>
33 <triggerFromChildProjects>false</triggerFromChildProjects>
33 <triggerWithNoParameters>false</triggerWithNoParameters> 34 <triggerWithNoParameters>false</triggerWithNoParameters>
34 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 35 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
35 </configs> 36 </configs>
@@ -70,6 +71,7 @@
70 </configs> 71 </configs>
71 <projects/> 72 <projects/>
72 <condition>UNSTABLE_OR_BETTER</condition> 73 <condition>UNSTABLE_OR_BETTER</condition>
74 <triggerFromChildProjects>false</triggerFromChildProjects>
73 <triggerWithNoParameters>false</triggerWithNoParameters> 75 <triggerWithNoParameters>false</triggerWithNoParameters>
74 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> 76 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
75 </configs> 77 </configs>
diff --git a/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.xml b/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.xml
new file mode 100644
index 0000000..f2bf89f
--- /dev/null
+++ b/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.xml
@@ -0,0 +1,83 @@
1<?xml version="1.0" encoding="utf-8"?>
2<matrix-project>
3 <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
4 <runSequentially>false</runSequentially>
5 </executionStrategy>
6 <combinationFilter/>
7 <axes>
8 <hudson.matrix.TextAxis>
9 <name>foo_bar</name>
10 <values>
11 <string>foo</string>
12 <string>bar</string>
13 </values>
14 </hudson.matrix.TextAxis>
15 </axes>
16 <actions/>
17 <description>&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
18 <keepDependencies>false</keepDependencies>
19 <displayName>JJB Test1</displayName>
20 <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
21 <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
22 <concurrentBuild>false</concurrentBuild>
23 <canRoam>true</canRoam>
24 <properties/>
25 <scm class="hudson.scm.NullSCM"/>
26 <builders/>
27 <publishers>
28 <hudson.plugins.parameterizedtrigger.BuildTrigger>
29 <configs>
30 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
31 <configs class="java.util.Collections$EmptyList"/>
32 <projects>foo</projects>
33 <condition>ALWAYS</condition>
34 <triggerFromChildProjects>true</triggerFromChildProjects>
35 <triggerWithNoParameters>false</triggerWithNoParameters>
36 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
37 </configs>
38 </hudson.plugins.parameterizedtrigger.BuildTrigger>
39 </publishers>
40 <buildWrappers/>
41</matrix-project>
42<BLANKLINE>
43<?xml version="1.0" encoding="utf-8"?>
44<matrix-project>
45 <executionStrategy class="hudson.matrix.DefaultMatrixExecutionStrategyImpl">
46 <runSequentially>false</runSequentially>
47 </executionStrategy>
48 <combinationFilter/>
49 <axes>
50 <hudson.matrix.TextAxis>
51 <name>foo_bar</name>
52 <values>
53 <string>foo</string>
54 <string>bar</string>
55 </values>
56 </hudson.matrix.TextAxis>
57 </axes>
58 <actions/>
59 <description>&lt;!-- Managed by Jenkins Job Builder --&gt;</description>
60 <keepDependencies>false</keepDependencies>
61 <displayName>JJB Test2</displayName>
62 <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
63 <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
64 <concurrentBuild>false</concurrentBuild>
65 <canRoam>true</canRoam>
66 <properties/>
67 <scm class="hudson.scm.NullSCM"/>
68 <builders/>
69 <publishers>
70 <hudson.plugins.parameterizedtrigger.BuildTrigger>
71 <configs>
72 <hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
73 <configs class="java.util.Collections$EmptyList"/>
74 <projects>foo</projects>
75 <condition>ALWAYS</condition>
76 <triggerFromChildProjects>false</triggerFromChildProjects>
77 <triggerWithNoParameters>false</triggerWithNoParameters>
78 </hudson.plugins.parameterizedtrigger.BuildTriggerConfig>
79 </configs>
80 </hudson.plugins.parameterizedtrigger.BuildTrigger>
81 </publishers>
82 <buildWrappers/>
83</matrix-project>
diff --git a/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.yaml b/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.yaml
new file mode 100644
index 0000000..d50d25a
--- /dev/null
+++ b/tests/yamlparser/fixtures/trigger_parameterized_builds/parameter-override-ordering-003.yaml
@@ -0,0 +1,36 @@
1- project:
2 name: trigger-from-child
3 jobs:
4 - 'hydra_{name}_jjb-test1'
5 - 'hydra_{name}_jjb-test2'
6
7- job-template:
8 project-type: matrix
9 axes:
10 - axis:
11 type: user-defined
12 name: foo_bar
13 values:
14 - foo
15 - bar
16 name: 'hydra_{name}_jjb-test1'
17 display-name: 'JJB Test1'
18 publishers:
19 - trigger-parameterized-builds:
20 - project: 'foo'
21 trigger-from-child-projects: true
22
23- job-template:
24 project-type: matrix
25 axes:
26 - axis:
27 type: user-defined
28 name: foo_bar
29 values:
30 - foo
31 - bar
32 name: 'hydra_{name}_jjb-test2'
33 display-name: 'JJB Test2'
34 publishers:
35 - trigger-parameterized-builds:
36 - project: 'foo'