Merge lp:~robru/cupstream2distro/force-rtm-versions into lp:cupstream2distro

[Robert Bruce Park]

Require '~rtm' in the version number for all source builds in RTM.

As requested by slangasek, all source builds for RTM are required to have ~rtm in the version number.

[lp:~robru/cupstream2distro/force-rtm-versions]

792. By Robert Bruce Park on 2014-10-27

And default to source syncs as well.

[Robert Bruce Park (robru)]

(don't be afraid of the deleted test, it tests a codepath that is being deleted)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

Lukasz gave a verbal approval in the landing meeting today.

review: Approve

[Łukasz Zemczak (sil2100)]

Right, as mentioned by Robert, a +1

review: Approve

=== modified file 'citrain/build.py'
--- citrain/build.py	2014-10-17 13:17:58 +0000
+++ citrain/build.py	2014-10-27 21:19:15 +0000
@@ -46,11 +46,6 @@
 TAKE_WHOLE_COMMIT_MESSAGE
     Use whole commit message in changelog, not just the brief part.
 
-DO_NOT_APPEND_RTM_TO_VERSION
-    Do not rewrite the version when doing a ubuntu-rtm landing, adding the ~rtm
-    tag to the upstream version. Should be used ONLY after the agreement of the
-    Landing Team.
-
 REBUILD_SOURCES_FOR_SYNC
     Only useful for sync requests. Instead of doing a binary copy of the
     packages from the selected archive, copy the sources and rebuild.
@@ -564,18 +559,14 @@
             if not packagemanager.has_dont_change_version_flag():
                 version = packagemanager.create_new_packaging_version(
                     previous_packaging_version,
-                    series_version=SERIES_VERSION[series.name],
-                    do_not_append_tag=(
-                        env.DO_NOT_APPEND_RTM_TO_VERSION == "true"))
+                    series_version=SERIES_VERSION[series.name])
             else:
                 version = packagemanager.get_packaging_version()
         else:
             version = packagemanager.create_new_packaging_version(
                 previous_packaging_version,
                 destppa=dest_ppa_name,
-                series_version=SERIES_VERSION[series.name],
-                do_not_append_tag=(
-                    env.DO_NOT_APPEND_RTM_TO_VERSION == "true"))
+                series_version=SERIES_VERSION[series.name])
 
         # Refresh symbol files
         logging.info("Update symbol files version if needed")
 
=== modified file 'citrain/jenkins-templates/build.xml.tmpl'
--- citrain/jenkins-templates/build.xml.tmpl	2014-10-17 13:17:58 +0000
+++ citrain/jenkins-templates/build.xml.tmpl	2014-10-27 21:19:15 +0000
@@ -62,14 +62,9 @@
           <defaultValue>false</defaultValue>
         </hudson.model.BooleanParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
-          <name>DO_NOT_APPEND_RTM_TO_VERSION</name>
-          <description>Do not rewrite the version when doing a ubuntu-rtm landing, adding the ~rtm tag to the upstream version. Should be used ONLY after the agreement of the Landing Team.</description>
-          <defaultValue>false</defaultValue>
-        </hudson.model.BooleanParameterDefinition>
-        <hudson.model.BooleanParameterDefinition>
           <name>REBUILD_SOURCES_FOR_SYNC</name>
           <description>Only useful for sync requests. Instead of doing a binary copy of the packages from the selected archive, copy the sources and rebuild.</description>
-          <defaultValue>false</defaultValue>
+          <defaultValue>true</defaultValue>
         </hudson.model.BooleanParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
           <name>DEBUG</name>
 
=== modified file 'cupstream2distro/packagemanager.py'
--- cupstream2distro/packagemanager.py	2014-10-20 23:28:07 +0000
+++ cupstream2distro/packagemanager.py	2014-10-27 21:19:15 +0000
@@ -540,8 +540,7 @@
 
 def create_new_packaging_version(base_package_version,
                                  series_version,
-                                 destppa='',
-                                 do_not_append_tag=False):
+                                 destppa=''):
     """Deliver a new packaging version, based on simple rules:
 
     Version would be <upstream_version>.<series>.<yyyymmdd(.minor)>-0ubuntu1
@@ -556,9 +555,8 @@
     # handle the special case of RTM
     special_tag = ""
     if series_version == "14.09":
-        if not do_not_append_tag:
-            logging.debug('Appending the ~rtm tag')
-            special_tag = "~rtm"
+        logging.debug('Appending the ~rtm tag')
+        special_tag = "~rtm"
         # XXX: we agreed that to keep the versioning sane, we need to stick to
         # versioning as per the main archive
         series_version = "14.10"
 
=== modified file 'tests/unit/test_packagemanager.py'
--- tests/unit/test_packagemanager.py	2014-10-20 23:28:07 +0000
+++ tests/unit/test_packagemanager.py	2014-10-27 21:19:15 +0000
@@ -1126,20 +1126,6 @@
             '42+14.10.19830913~rtm-0ubuntu1')
         strftime_call.assert_called_with('%Y%m%d')
 
-    @patch('cupstream2distro.packagemanager.datetime')
-    def test_new_packaging_version_for_rtm_without_appending_tag(
-            self, datetimeMock):
-        """Create a version for ubuntu-rtm, but without forcing ~rtm."""
-        strftime_call = datetimeMock.date.today.return_value.strftime
-        strftime_call.side_effect = lambda date: '19830913'
-        self.assertEqual(
-            packagemanager.create_new_packaging_version(
-                '42+13.10.19830912-0ubuntu1',
-                '14.09',
-                do_not_append_tag=True),
-            '42+14.10.19830913-0ubuntu1')
-        strftime_call.assert_called_with('%Y%m%d')
-
     def test_get_packaging_sourcename(self):
         """Get the packaging source name."""
         self.get_data_branch('onemanualupload')