CI Train [cu2d]

Merge lp:~sil2100/cupstream2distro/do_not_append_rtm_by_default into lp:cupstream2distro

  1. do_not_append_rtm_by_default
  2. Merge into trunk
Proposed by Łukasz Zemczak
Status: Merged
Approved by: Robert Bruce Park
Approved revision: 752
Merged at revision: 751
Proposed branch: lp:~sil2100/cupstream2distro/do_not_append_rtm_by_default
Merge into: lp:cupstream2distro
Diff against target: 58 lines (+8/-8)
2 files modified
citrain/build.py (+6/-6)
citrain/jenkins-templates/build.xml.tmpl (+2/-2)
To merge this branch: bzr merge lp:~sil2100/cupstream2distro/do_not_append_rtm_by_default
Reviewer Review Type Date Requested Status
Robert Bruce Park (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+235846@code.launchpad.net

Commit message

Change the DO_NOT_APPEND_RTM_TO_VERSION flag to APPEND_RTM_TO_VERSION, disabling the addition of ~rtm by default

Description of the change

Change the DO_NOT_APPEND_RTM_TO_VERSION flag to APPEND_RTM_TO_VERSION, disabling the addition of ~rtm by default

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:751
http://jenkins.qa.ubuntu.com/job/cu2d-choo-choo-ci/152/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cu2d-choo-choo-ci/152/rebuild

review: Approve (continuous-integration)
Revision history for this message
Robert Bruce Park (robru) wrote :

Don't forget to change this in the jenkins xml template too.

review: Needs Fixing
Revision history for this message
Robert Bruce Park (robru) wrote :

As a side note, I like that the variable name is shorter ;-)

lp:~sil2100/cupstream2distro/do_not_append_rtm_by_default updated
752. By Łukasz Zemczak

Update the template files, thanks Robert o/

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:752
http://jenkins.qa.ubuntu.com/job/cu2d-choo-choo-ci/154/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cu2d-choo-choo-ci/154/rebuild

review: Approve (continuous-integration)
Revision history for this message
Robert Bruce Park (robru) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'citrain/build.py'
2--- citrain/build.py 2014-09-23 12:16:32 +0000
3+++ citrain/build.py 2014-09-24 19:26:32 +0000
4@@ -46,9 +46,9 @@
5 TAKE_WHOLE_COMMIT_MESSAGE
6 Use whole commit message in changelog, not just the brief part.
7
8-DO_NOT_APPEND_RTM_TO_VERSION
9- Do not rewrite the package version when doing uploads to ubuntu-rtm
10- (e.g. do not add the ~rtm to the upstream part)
11+APPEND_RTM_TO_VERSION
12+ Rewrite the version when doing a ubuntu-rtm landing, adding the ~rtm tag
13+ to the upstream version.
14
15 REBUILD_SOURCES_FOR_SYNC
16 Only useful for sync requests. Instead of doing a binary copy of the
17@@ -449,7 +449,7 @@
18 previous_packaging_version,
19 series_version=SERIES_VERSION[series.name],
20 do_not_append_tag=(
21- env.DO_NOT_APPEND_RTM_TO_VERSION == "true"))
22+ env.APPEND_RTM_TO_VERSION != "true"))
23 else:
24 version = packagemanager.get_packaging_version()
25 else:
26@@ -458,7 +458,7 @@
27 destppa=dest_ppa_name,
28 series_version=SERIES_VERSION[series.name],
29 do_not_append_tag=(
30- env.DO_NOT_APPEND_RTM_TO_VERSION == "true"))
31+ env.APPEND_RTM_TO_VERSION != "true"))
32
33 # Refresh symbol files
34 logging.info("Update symbol files version if needed")
35@@ -668,7 +668,7 @@
36 new_version = current_version
37 if env.REBUILD_SOURCES_FOR_SYNC == "true":
38
39- if (env.DO_NOT_APPEND_RTM_TO_VERSION != "true"):
40+ if (env.APPEND_RTM_TO_VERSION == "true"):
41 if (source_archive.distribution.name == "ubuntu" and
42 dest.distribution.name == "ubuntu-rtm"):
43 logging.debug("Rewriting the version to: {}".format(
44
45=== modified file 'citrain/jenkins-templates/build.xml.tmpl'
46--- citrain/jenkins-templates/build.xml.tmpl 2014-09-19 17:20:19 +0000
47+++ citrain/jenkins-templates/build.xml.tmpl 2014-09-24 19:26:32 +0000
48@@ -62,8 +62,8 @@
49 <defaultValue>false</defaultValue>
50 </hudson.model.BooleanParameterDefinition>
51 <hudson.model.BooleanParameterDefinition>
52- <name>DO_NOT_APPEND_RTM_TO_VERSION</name>
53- <description>Do not rewrite the package version when doing uploads to ubuntu-rtm (e.g. do not add the ~rtm to the upstream part)</description>
54+ <name>APPEND_RTM_TO_VERSION</name>
55+ <description>Rewrite the version when doing a ubuntu-rtm landing, adding the ~rtm tag to the upstream version.</description>
56 <defaultValue>false</defaultValue>
57 </hudson.model.BooleanParameterDefinition>
58 <hudson.model.BooleanParameterDefinition>

Subscribers

People subscribed via source and target branches