Merge lp:~mrazik/cupstream2distro-config/mbs-support into lp:cupstream2distro-config
- mbs-support
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Francis Ginther |
Approved revision: | 84 |
Merged at revision: | 77 |
Proposed branch: | lp:~mrazik/cupstream2distro-config/mbs-support |
Merge into: | lp:cupstream2distro-config |
Diff against target: |
227 lines (+52/-28) 6 files modified
c2dconfigutils/cu2dUpdateCi.py (+3/-0) ci/jenkins-templates/mbs-autolanding-config.xml.tmpl (+17/-14) ci/jenkins-templates/mbs-pbuilder-config.xml.tmpl (+8/-3) stacks/experimental/100scopes.cfg (+3/-2) stacks/head/oif.cfg (+1/-4) tests/test_cu2dUpdateCi.py (+20/-5) |
To merge this branch: | bzr merge lp:~mrazik/cupstream2distro-config/mbs-support |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Francis Ginther | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email: mp+153531@code.launchpad.net |
Commit message
Adding MBS support (local archive) to cupstream2distr
Job-specific "local dput" jobs were completely removed and the logic moved to the top-level autolanding job as a build step.
Description of the change
Adding MBS support (local archive) to cupstream2distr
Job-specific "local dput" jobs were completely removed and the logic moved to the top-level autolanding job as a build step.
- 78. By Martin Mrazik
-
removing dput_job from autolanding template
- 79. By Martin Mrazik
-
fixed tests
PS Jenkins bot (ps-jenkins) wrote : | # |
- 80. By Martin Mrazik
-
renamed "project" variable to "project_name" and it is now available in all jobs
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:80
http://
Executed test runs:
SUCCESS: http://
Click here to trigger a rebuild:
http://
Martin Mrazik (mrazik) wrote : | # |
btw. I just deployed this for the 100scopes stack for some real, production testing ;)
- 81. By Martin Mrazik
-
using $JOB_NAME instead of $flavor for the tmp dir
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:81
http://
Executed test runs:
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 82. By Martin Mrazik
-
merging with trunk
- 83. By Martin Mrazik
-
oif stack migration to the new mbs jobs
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:83
http://
Executed test runs:
SUCCESS: http://
Click here to trigger a rebuild:
http://
Francis Ginther (fginther) wrote : | # |
The changes look good, the template changes adequately replace the old dput-mbs-pt jobs. There are some pep8 errors so marking as needs-fixing:
$ pep8 .
./tests/
./tests/
./tests/
./tests/
./tests/
This replaces the bulk of the mbs jenkins jobs. The missing piece is the automatic rebuild of downstream dependencies. For example, if a new compiz is built, the old mbs jobs will rebuild unity with the unity-build-mbs-pt job. There is also the *-check-mbs-pt jobs which are used to defer a rebuild if another upstream MP is pending, but these should be removed anyway. If we care about unintended API breakages, we still have some work to do (open a bug for this?).
- 84. By Martin Mrazik
-
fixed pep8 issues
Martin Mrazik (mrazik) wrote : | # |
> The changes look good, the template changes adequately replace the old dput-
> mbs-pt jobs. There are some pep8 errors so marking as needs-fixing:
> $ pep8 .
> ./tests/
> ./tests/
> ./tests/
> ./tests/
> ./tests/
Oops. Fixed.
> This replaces the bulk of the mbs jenkins jobs. The missing piece is the
> automatic rebuild of downstream dependencies. For example, if a new compiz is
> built, the old mbs jobs will rebuild unity with the unity-build-mbs-pt job.
Is this a regression in the context of lp:cupstream2distro-config? I was actually wondering about this earlier today and had an impression the current oif deployment suffers from the same problem?
> There is also the *-check-mbs-pt jobs which are used to defer a rebuild if
> another upstream MP is pending, but these should be removed anyway. If we care
> about unintended API breakages, we still have some work to do (open a bug for
> this?).
If its not a regression (in lp:cupstream2distro-config) then yes, we should open a bug.
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:84
http://
Executed test runs:
SUCCESS: http://
Click here to trigger a rebuild:
http://
Francis Ginther (fginther) wrote : | # |
> Oops. Fixed.
Thanks
> > This replaces the bulk of the mbs jenkins jobs. The missing piece is the
> > automatic rebuild of downstream dependencies. For example, if a new compiz
> is
> > built, the old mbs jobs will rebuild unity with the unity-build-mbs-pt job.
>
> Is this a regression in the context of lp:cupstream2distro-config? I was
> actually wondering about this earlier today and had an impression the current
> oif deployment suffers from the same problem?
With this MP, the oif stack will be broken. The old dput jobs (i.e. frame-dput-mbs-pt) have additional bits to call the other mbs jobs. This has really only been useful for unity, which we can manually hack into the jenkins jobs if necessary.
> > There is also the *-check-mbs-pt jobs which are used to defer a rebuild if
> > another upstream MP is pending, but these should be removed anyway. If we
> care
> > about unintended API breakages, we still have some work to do (open a bug
> for
> > this?).
>
> If its not a regression (in lp:cupstream2distro-config) then yes, we should
> open a bug.
Martin Mrazik (mrazik) wrote : | # |
I've created https:/
Preview Diff
1 | === modified file 'c2dconfigutils/cu2dUpdateCi.py' | |||
2 | --- c2dconfigutils/cu2dUpdateCi.py 2013-03-14 08:11:12 +0000 | |||
3 | +++ c2dconfigutils/cu2dUpdateCi.py 2013-03-15 15:29:21 +0000 | |||
4 | @@ -174,6 +174,9 @@ | |||
5 | 174 | for parameter in parameters: | 174 | for parameter in parameters: |
6 | 175 | ctx[parameter] = parameters[parameter] | 175 | ctx[parameter] = parameters[parameter] |
7 | 176 | self.add_parameter(ctx, parameter, parameters[parameter]) | 176 | self.add_parameter(ctx, parameter, parameters[parameter]) |
8 | 177 | # add project name as well | ||
9 | 178 | ctx['project_name'] = project_name | ||
10 | 179 | self.add_parameter(ctx, 'project_name', project_name) | ||
11 | 177 | return ctx | 180 | return ctx |
12 | 178 | 181 | ||
13 | 179 | def generate_jobs(self, job_list, project_name, job_type, job_config, | 182 | def generate_jobs(self, job_list, project_name, job_type, job_config, |
14 | 180 | 183 | ||
15 | === modified file 'ci/jenkins-templates/mbs-autolanding-config.xml.tmpl' | |||
16 | --- ci/jenkins-templates/mbs-autolanding-config.xml.tmpl 2013-03-14 18:53:34 +0000 | |||
17 | +++ ci/jenkins-templates/mbs-autolanding-config.xml.tmpl 2013-03-15 15:29:21 +0000 | |||
18 | @@ -45,6 +45,9 @@ | |||
19 | 45 | <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> | 45 | <hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> |
20 | 46 | <configs> | 46 | <configs> |
21 | 47 | <hudson.plugins.parameterizedtrigger.CurrentBuildParameters/> | 47 | <hudson.plugins.parameterizedtrigger.CurrentBuildParameters/> |
22 | 48 | <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> | ||
23 | 49 | <properties>UPSTREAM_BUILD_NUMBER=$BUILD_NUMBER</properties> | ||
24 | 50 | </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> | ||
25 | 48 | </configs> | 51 | </configs> |
26 | 49 | <projects>{{ builder_list }}</projects> | 52 | <projects>{{ builder_list }}</projects> |
27 | 50 | <condition>ALWAYS</condition> | 53 | <condition>ALWAYS</condition> |
28 | @@ -70,6 +73,20 @@ | |||
29 | 70 | </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> | 73 | </hudson.plugins.parameterizedtrigger.BlockableBuildTriggerConfig> |
30 | 71 | </configs> | 74 | </configs> |
31 | 72 | </hudson.plugins.parameterizedtrigger.TriggerBuilder> | 75 | </hudson.plugins.parameterizedtrigger.TriggerBuilder> |
32 | 76 | <hudson.tasks.Shell> | ||
33 | 77 | <command>#!/bin/bash | ||
34 | 78 | set -x | ||
35 | 79 | |||
36 | 80 | temp_dir=${local_archive_tmp}/${project_name}-al-${local_archive_pocket}-${BUILD_NUMBER} | ||
37 | 81 | ppa_build_number=${BUILD_NUMBER} | ||
38 | 82 | |||
39 | 83 | |||
40 | 84 | for p in `ssh ${local_archive_login}@${local_archive_host} ls ${temp_dir}`; do | ||
41 | 85 | ssh ${local_archive_login}@${local_archive_host} dput -ufU --config /home/ubuntu/.dput.cf ${local_archive} ${temp_dir}/${p}/*.changes | ||
42 | 86 | # Execute mini-dinstall to update the local archive | ||
43 | 87 | ssh ${local_archive_login}@${local_archive_host} mini-dinstall --no-db --batch --config="/home/ubuntu/.mini-dinstall-${local_archive}.conf" | ||
44 | 88 | done</command> | ||
45 | 89 | </hudson.tasks.Shell> | ||
46 | 73 | {% if aggregate_tests_script %} | 90 | {% if aggregate_tests_script %} |
47 | 74 | <hudson.tasks.Shell> | 91 | <hudson.tasks.Shell> |
48 | 75 | <command>{{ aggregate_tests_script }}</command> | 92 | <command>{{ aggregate_tests_script }}</command> |
49 | @@ -149,20 +166,6 @@ | |||
50 | 149 | <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> | 166 | <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> |
51 | 150 | <properties>local_archive_host=$local_archive_host | 167 | <properties>local_archive_host=$local_archive_host |
52 | 151 | local_archive_login=$local_archive_login | 168 | local_archive_login=$local_archive_login |
53 | 152 | temp_dir=${local_archive_tmp}/${project}-al-${local_archive_pocket}-${BUILD_NUMBER} | ||
54 | 153 | ppa_build_number=${BUILD_NUMBER} | ||
55 | 154 | distributions=</properties> | ||
56 | 155 | </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> | ||
57 | 156 | </configs> | ||
58 | 157 | <projects>{{ dput_job }}</projects> | ||
59 | 158 | <condition>SUCCESS</condition> | ||
60 | 159 | <triggerWithNoParameters>false</triggerWithNoParameters> | ||
61 | 160 | </hudson.plugins.parameterizedtrigger.BuildTriggerConfig> | ||
62 | 161 | <hudson.plugins.parameterizedtrigger.BuildTriggerConfig> | ||
63 | 162 | <configs> | ||
64 | 163 | <hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> | ||
65 | 164 | <properties>local_archive_host=$local_archive_host | ||
66 | 165 | local_archive_login=$local_archive_login | ||
67 | 166 | temp_dir=${local_archive_tmp}/${project}-al-${local_archive_pocket}-${BUILD_NUMBER}</properties> | 169 | temp_dir=${local_archive_tmp}/${project}-al-${local_archive_pocket}-${BUILD_NUMBER}</properties> |
68 | 167 | </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> | 170 | </hudson.plugins.parameterizedtrigger.PredefinedBuildParameters> |
69 | 168 | </configs> | 171 | </configs> |
70 | 169 | 172 | ||
71 | === modified file 'ci/jenkins-templates/mbs-pbuilder-config.xml.tmpl' | |||
72 | --- ci/jenkins-templates/mbs-pbuilder-config.xml.tmpl 2013-03-14 14:59:37 +0000 | |||
73 | +++ ci/jenkins-templates/mbs-pbuilder-config.xml.tmpl 2013-03-15 15:29:21 +0000 | |||
74 | @@ -17,6 +17,11 @@ | |||
75 | 17 | <description>Specifies that this is an autolanding/merge job. Used to properly set package version string.</description> | 17 | <description>Specifies that this is an autolanding/merge job. Used to properly set package version string.</description> |
76 | 18 | <defaultValue></defaultValue> | 18 | <defaultValue></defaultValue> |
77 | 19 | </hudson.model.StringParameterDefinition> | 19 | </hudson.model.StringParameterDefinition> |
78 | 20 | <hudson.model.StringParameterDefinition> | ||
79 | 21 | <name>UPSTREAM_BUILD_NUMBER</name> | ||
80 | 22 | <description>Build number of the upstream job used in the tmp directory with the deb output</description> | ||
81 | 23 | <defaultValue></defaultValue> | ||
82 | 24 | </hudson.model.StringParameterDefinition> | ||
83 | 20 | {% for parameter in parameter_list %} | 25 | {% for parameter in parameter_list %} |
84 | 21 | <hudson.model.StringParameterDefinition> | 26 | <hudson.model.StringParameterDefinition> |
85 | 22 | <name>{{ parameter.name }}</name> | 27 | <name>{{ parameter.name }}</name> |
86 | @@ -62,17 +67,17 @@ | |||
87 | 62 | exit 0 | 67 | exit 0 |
88 | 63 | fi | 68 | fi |
89 | 64 | 69 | ||
91 | 65 | tmp_dir="${local_archive_tmp}/${project}-al-${local_archive_pocket}-${BUILD_NUMBER}" | 70 | tmp_dir="${local_archive_tmp}/${project_name}-al-${local_archive_pocket}-${UPSTREAM_BUILD_NUMBER}" |
92 | 66 | 71 | ||
93 | 67 | # mkdir "${tmp_dir}" can fail due to multiple jobs attempting to create the directory | 72 | # mkdir "${tmp_dir}" can fail due to multiple jobs attempting to create the directory |
94 | 68 | ssh ${local_archive_login}@${local_archive_host} mkdir "${tmp_dir}" || true | 73 | ssh ${local_archive_login}@${local_archive_host} mkdir "${tmp_dir}" || true |
96 | 69 | ssh ${local_archive_login}@${local_archive_host} mkdir "${tmp_dir}/${flavor}" | 74 | ssh ${local_archive_login}@${local_archive_host} mkdir "${tmp_dir}/${JOB_NAME}" |
97 | 70 | 75 | ||
98 | 71 | # Switch to the output directory containing the build results | 76 | # Switch to the output directory containing the build results |
99 | 72 | cd work/output | 77 | cd work/output |
100 | 73 | 78 | ||
101 | 74 | # Copy the build results to the temporary holding area, if all jobs succeed, these will be dput into the ppa archive. | 79 | # Copy the build results to the temporary holding area, if all jobs succeed, these will be dput into the ppa archive. |
103 | 75 | scp * ${local_archive_login}@${local_archive_host}:${tmp_dir}/${flavor}</command> | 80 | scp * ${local_archive_login}@${local_archive_host}:${tmp_dir}/${JOB_NAME}</command> |
104 | 76 | </hudson.tasks.Shell> | 81 | </hudson.tasks.Shell> |
105 | 77 | </builders> | 82 | </builders> |
106 | 78 | <publishers> | 83 | <publishers> |
107 | 79 | 84 | ||
108 | === modified file 'stacks/experimental/100scopes.cfg' | |||
109 | --- stacks/experimental/100scopes.cfg 2013-03-15 13:31:45 +0000 | |||
110 | +++ stacks/experimental/100scopes.cfg 2013-03-15 15:29:21 +0000 | |||
111 | @@ -6,7 +6,8 @@ | |||
112 | 6 | dest: ubuntu-unity/experimental-certified | 6 | dest: ubuntu-unity/experimental-certified |
113 | 7 | schedule: 0 7 * * 1-5 | 7 | schedule: 0 7 * * 1-5 |
114 | 8 | ci_default: | 8 | ci_default: |
116 | 9 | hooks: D08add_ppa-ubuntu-unity-experimental-prevalidation #TODO: anythin mbs specific? | 9 | hooks: D08add_ppa-ubuntu-unity-experimental-prevalidation D00mbs_archive H05set_package_version H40disable_gensymbols_check |
117 | 10 | hook_source: lp:~private-ps-quality-team/+junk/scopes-hooks | ||
118 | 10 | contact_email: "martin.mrazik@canonical.com" | 11 | contact_email: "martin.mrazik@canonical.com" |
119 | 11 | autolanding_template: mbs-autolanding-config.xml.tmpl | 12 | autolanding_template: mbs-autolanding-config.xml.tmpl |
120 | 12 | configurations: | 13 | configurations: |
121 | @@ -16,9 +17,9 @@ | |||
122 | 16 | local_archive_host: naartjie | 17 | local_archive_host: naartjie |
123 | 17 | local_archive_login: ubuntu | 18 | local_archive_login: ubuntu |
124 | 18 | local_archive_tmp: /home/ubuntu/ppa_archive/100scopes-experimental | 19 | local_archive_tmp: /home/ubuntu/ppa_archive/100scopes-experimental |
125 | 20 | local_archive: 100scopes-experimental | ||
126 | 19 | local_archive_source: http://naartjie/archive/100scopes-experimental | 21 | local_archive_source: http://naartjie/archive/100scopes-experimental |
127 | 20 | local_archive_pocket: raring | 22 | local_archive_pocket: raring |
128 | 21 | #TODO: what about dput_job | ||
129 | 22 | projects: | 23 | projects: |
130 | 23 | libunity: | 24 | libunity: |
131 | 24 | target_branch: lp:~unity-team/libunity/libunity-7.0 | 25 | target_branch: lp:~unity-team/libunity/libunity-7.0 |
132 | 25 | 26 | ||
133 | === modified file 'stacks/head/oif.cfg' | |||
134 | --- stacks/head/oif.cfg 2013-03-12 17:42:05 +0000 | |||
135 | +++ stacks/head/oif.cfg 2013-03-15 15:29:21 +0000 | |||
136 | @@ -28,6 +28,7 @@ | |||
137 | 28 | local_archive_host: naartjie | 28 | local_archive_host: naartjie |
138 | 29 | local_archive_login: ubuntu | 29 | local_archive_login: ubuntu |
139 | 30 | local_archive_tmp: /home/ubuntu/ppa_archive/oif-staging | 30 | local_archive_tmp: /home/ubuntu/ppa_archive/oif-staging |
140 | 31 | local_archive: oif-staging | ||
141 | 31 | local_archive_source: http://naartjie/archive/oif-staging | 32 | local_archive_source: http://naartjie/archive/oif-staging |
142 | 32 | local_archive_pocket: raring | 33 | local_archive_pocket: raring |
143 | 33 | dependencies: | 34 | dependencies: |
144 | @@ -43,10 +44,6 @@ | |||
145 | 43 | raring-armhf: | 44 | raring-armhf: |
146 | 44 | template: pbuilder-config.xml.tmpl | 45 | template: pbuilder-config.xml.tmpl |
147 | 45 | frame: | 46 | frame: |
148 | 46 | dput_job: frame-dput-mbs-pt | ||
149 | 47 | geis: | 47 | geis: |
150 | 48 | dput_job: geis-dput-mbs-pt | ||
151 | 49 | grail: | 48 | grail: |
152 | 50 | dput_job: grail-dput-mbs-pt | ||
153 | 51 | libgrip: | 49 | libgrip: |
154 | 52 | dput_job: libgrip-dput-mbs-pt | ||
155 | 53 | 50 | ||
156 | === modified file 'tests/test_cu2dUpdateCi.py' | |||
157 | --- tests/test_cu2dUpdateCi.py 2013-03-14 02:44:09 +0000 | |||
158 | +++ tests/test_cu2dUpdateCi.py 2013-03-15 15:29:21 +0000 | |||
159 | @@ -75,8 +75,11 @@ | |||
160 | 75 | def test_project_config_implied_target_branch(self): | 75 | def test_project_config_implied_target_branch(self): |
161 | 76 | config = {} | 76 | config = {} |
162 | 77 | expected = {'target_branch': 'lp:project', | 77 | expected = {'target_branch': 'lp:project', |
163 | 78 | 'project_name': 'project', | ||
164 | 78 | 'parameter_list': [JobParameter('target_branch', | 79 | 'parameter_list': [JobParameter('target_branch', |
166 | 79 | 'lp:project')]} | 80 | 'lp:project'), |
167 | 81 | JobParameter('project_name', | ||
168 | 82 | 'project')]} | ||
169 | 80 | actual = self.update_ci.process_project_config('project', config) | 83 | actual = self.update_ci.process_project_config('project', config) |
170 | 81 | self.assertEqual(expected, actual) | 84 | self.assertEqual(expected, actual) |
171 | 82 | 85 | ||
172 | @@ -84,15 +87,21 @@ | |||
173 | 84 | config = {'target_branch': 'lp:project/sub'} | 87 | config = {'target_branch': 'lp:project/sub'} |
174 | 85 | expected = {'target_branch': 'lp:project/sub', | 88 | expected = {'target_branch': 'lp:project/sub', |
175 | 86 | 'parameter_list': [JobParameter('target_branch', | 89 | 'parameter_list': [JobParameter('target_branch', |
177 | 87 | 'lp:project/sub')]} | 90 | 'lp:project/sub'), |
178 | 91 | JobParameter('project_name', | ||
179 | 92 | 'project')], | ||
180 | 93 | 'project_name': 'project'} | ||
181 | 88 | actual = self.update_ci.process_project_config('project', config) | 94 | actual = self.update_ci.process_project_config('project', config) |
182 | 89 | self.assertEqual(expected, actual) | 95 | self.assertEqual(expected, actual) |
183 | 90 | 96 | ||
184 | 91 | def test_project_config_ctx_only(self): | 97 | def test_project_config_ctx_only(self): |
185 | 92 | config = {'team': 'team_name'} | 98 | config = {'team': 'team_name'} |
186 | 93 | expected = {'target_branch': 'lp:project', | 99 | expected = {'target_branch': 'lp:project', |
187 | 100 | 'project_name': 'project', | ||
188 | 94 | 'parameter_list': [JobParameter('target_branch', | 101 | 'parameter_list': [JobParameter('target_branch', |
190 | 95 | 'lp:project')], | 102 | 'lp:project'), |
191 | 103 | JobParameter('project_name', | ||
192 | 104 | 'project')], | ||
193 | 96 | 'team': 'team_name'} | 105 | 'team': 'team_name'} |
194 | 97 | actual = self.update_ci.process_project_config('project', config) | 106 | actual = self.update_ci.process_project_config('project', config) |
195 | 98 | self.assertEqual(expected, actual) | 107 | self.assertEqual(expected, actual) |
196 | @@ -101,10 +110,13 @@ | |||
197 | 101 | config = {'some_parameter': 'some_value'} | 110 | config = {'some_parameter': 'some_value'} |
198 | 102 | expected = {'target_branch': 'lp:project', | 111 | expected = {'target_branch': 'lp:project', |
199 | 103 | 'some_parameter': 'some_value', | 112 | 'some_parameter': 'some_value', |
200 | 113 | 'project_name': 'project', | ||
201 | 104 | 'parameter_list': [JobParameter('target_branch', | 114 | 'parameter_list': [JobParameter('target_branch', |
202 | 105 | 'lp:project'), | 115 | 'lp:project'), |
203 | 106 | JobParameter('some_parameter', | 116 | JobParameter('some_parameter', |
205 | 107 | 'some_value')]} | 117 | 'some_value'), |
206 | 118 | JobParameter('project_name', | ||
207 | 119 | 'project')]} | ||
208 | 108 | actual = self.update_ci.process_project_config('project', config) | 120 | actual = self.update_ci.process_project_config('project', config) |
209 | 109 | self.assertEqual(expected, actual) | 121 | self.assertEqual(expected, actual) |
210 | 110 | 122 | ||
211 | @@ -125,12 +137,15 @@ | |||
212 | 125 | expected = {'hook_location': '/tmp/$JOB_NAME-hooks', | 137 | expected = {'hook_location': '/tmp/$JOB_NAME-hooks', |
213 | 126 | 'target_branch': 'lp:project', | 138 | 'target_branch': 'lp:project', |
214 | 127 | 'hook_source': 'lp:hooks', | 139 | 'hook_source': 'lp:hooks', |
215 | 140 | 'project_name': 'project', | ||
216 | 128 | 'acquire_hook_script': script.format( | 141 | 'acquire_hook_script': script.format( |
217 | 129 | DEFAULT_HOOK_LOCATION='/tmp/$JOB_NAME-hooks'), | 142 | DEFAULT_HOOK_LOCATION='/tmp/$JOB_NAME-hooks'), |
218 | 130 | 'parameter_list': [JobParameter('target_branch', | 143 | 'parameter_list': [JobParameter('target_branch', |
219 | 131 | 'lp:project'), | 144 | 'lp:project'), |
220 | 132 | JobParameter('hook_source', | 145 | JobParameter('hook_source', |
222 | 133 | 'lp:hooks')]} | 146 | 'lp:hooks'), |
223 | 147 | JobParameter('project_name', | ||
224 | 148 | 'project')]} | ||
225 | 134 | with patch('c2dconfigutils.cu2dUpdateCi.open', | 149 | with patch('c2dconfigutils.cu2dUpdateCi.open', |
226 | 135 | create=True) as mock_open: | 150 | create=True) as mock_open: |
227 | 136 | mock_open.return_value = MagicMock(spec=file) | 151 | mock_open.return_value = MagicMock(spec=file) |
PASSED: Continuous integration, rev:79 jenkins. qa.ubuntu. com/job/ cupstream2distr o-config- ci/28/ jenkins. qa.ubuntu. com/job/ cupstream2distr o-config- raring- amd64-ci/ 28/console
http://
Executed test runs:
SUCCESS: http://
Click here to trigger a rebuild: jenkins. qa.ubuntu. com/job/ cupstream2distr o-config- ci/28/rebuild
http://