Merge lp:~robru/cupstream2distro/new-reverter into lp:cupstream2distro

[Robert Bruce Park]

New revert job.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

This is looking really good in staging.

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~robru/cupstream2distro/new-reverter]

939. By Robert Bruce Park on 2015-03-10

Rewrite reverter.py with 100% test coverage.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'Makefile'
--- Makefile	2015-03-03 09:45:08 +0000
+++ Makefile	2015-03-10 17:39:11 +0000
@@ -1,5 +1,5 @@
 check: check3 check2
-	python3 -m coverage report --include='c*/*' --show-missing --fail-under=79
+	python3 -m coverage report --include='c*/*' --show-missing --fail-under=85
 
 check2:
 	python -m coverage run -m nose2

=== modified file 'citrain/build.py'
--- citrain/build.py	2015-03-09 23:41:22 +0000
+++ citrain/build.py	2015-03-10 17:39:11 +0000
@@ -566,6 +566,26 @@
     from_archive = None
     from_series = None
 
+    def delete_old_dsc(self):
+        """Original DSC is not needed, we will generate a new one."""
+        for old_dsc in glob(SILO_DIR('{}_*.dsc'.format(self.name))):
+            with suppress(OSError):
+                log_value_of.old_dsc('Deleting!')
+                os.remove(old_dsc)
+
+    def position_source(self, from_dir):
+        """Move the original source tree to the correct location."""
+        shutil.rmtree(self.path, ignore_errors=True)
+        shutil.move(from_dir, self.path)
+
+    def rename_orig_tarball(self, new_upstream):
+        for orig_tarball in glob(SILO_DIR('{}_*.orig.*'.format(self.name))):
+            log_value_of.orig_tarball()
+            ext = orig_tarball.split('.')[-1]
+            tarball = '{}_{}.orig.tar.{}'.format(self.name, new_upstream, ext)
+            log_value_of.tarball('Renaming orig.tar to')
+            shutil.move(orig_tarball, SILO_DIR(tarball))
+
     def collect_phase(self):
         """Download sync packages from the sync source."""
         logging.info('Preparing source sync for {}.'.format(self.name))
@@ -574,12 +594,8 @@
             self.name, self.from_archive, from_series, path=SILO_DIR())
         if from_dir is None:
             raise BuildError('{} not found in archive.'.format(self.name))
-        for old_dsc in glob(SILO_DIR('{}_*.dsc'.format(self.name))):
-            with suppress(OSError):
-                log_value_of.old_dsc('Deleting!')
-                os.remove(old_dsc)
-        shutil.rmtree(self.path, ignore_errors=True)
-        shutil.move(from_dir, self.path)
+        self.delete_old_dsc()
+        self.position_source(from_dir)
         from_version = self.get_package_version()
         new_version = from_version.replace('~rtm', '')
         ppa_version = pm.get_current_version_for_series(
@@ -593,12 +609,7 @@
             new_version = V(new_version).append_tag('rtm')
         log_value_of.new_version()
         new_upstream = V(new_version).get_upstream()
-        for orig_tarball in glob(SILO_DIR('{}_*.orig.*'.format(self.name))):
-            log_value_of.orig_tarball()
-            ext = orig_tarball.split('.')[-1]
-            tarball = '{}_{}.orig.tar.{}'.format(self.name, new_upstream, ext)
-            log_value_of.tarball('Renaming orig.tar to')
-            shutil.move(orig_tarball, SILO_DIR(tarball))
+        self.rename_orig_tarball(new_upstream)
         self.correct_package_changelog(new_version, self.series.name)
         self.initialize_branch()
         DotProject.soft_save(self.name, dest=dest_version, ours=new_version)
@@ -741,13 +752,13 @@
         getattr(BuildBase, 'post_{}_phase'.format(phase), nop)(self.silo_state)
 
 
-def main():
+def main(manager=BuildManager):
     """Execute the build, logging & saving any errors.
 
     :returns: 0 on success, 1 on any failure.
     """
     silo_state = SiloState(env.SILONAME)
-    buildmanager = BuildManager(silo_state)
+    buildmanager = manager(silo_state)
     phases = ('validate', 'clean', 'collect', 'build', 'upload', 'watch')
     if env.WATCH_ONLY == 'true':
         phases = ('validate', 'watch')

=== added file 'citrain/jenkins-templates/revert.xml.tmpl'
--- citrain/jenkins-templates/revert.xml.tmpl	1970-01-01 00:00:00 +0000
+++ citrain/jenkins-templates/revert.xml.tmpl	2015-03-10 17:39:11 +0000
@@ -0,0 +1,91 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project>
+  <actions/>
+  <description>Perform revert of selected silo packages.</description>
+  <logRotator>
+    <daysToKeep>15</daysToKeep>
+    <numToKeep>-1</numToKeep>
+    <artifactDaysToKeep>-1</artifactDaysToKeep>
+    <artifactNumToKeep>-1</artifactNumToKeep>
+  </logRotator>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <hudson.security.AuthorizationMatrixProperty>
+      <permission>hudson.model.Item.Read:ubuntu-core-dev</permission>
+      <permission>hudson.model.Item.Cancel:ubuntu-core-dev</permission>
+      <permission>hudson.model.Item.Build:ubuntu-core-dev</permission>
+      <permission>hudson.model.Item.Read:canonical-ci-eng</permission>
+      <permission>hudson.model.Item.Cancel:canonical-ci-eng</permission>
+      <permission>hudson.model.Item.Build:canonical-ci-eng</permission>
+      <permission>hudson.model.Item.Read:ubuntu-unity</permission>
+      <permission>hudson.model.Item.Cancel:ubuntu-unity</permission>
+      <permission>hudson.model.Item.Build:ubuntu-unity</permission>
+    </hudson.security.AuthorizationMatrixProperty>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>SILONAME</name>
+          <description>The silo you previously prepared to handle this revert in. Must be in the form of "ubuntu/landing-xxx"</description>
+          <defaultValue>ubuntu/landing-</defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>PACKAGE_VERSIONS</name>
+          <description>The package versions you desire to revert down to. Must be in the form of "foo=1.0 bar=2.0". Leave blank to automatically revert to the second-most-recent version.</description>
+          <defaultValue></defaultValue>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.BooleanParameterDefinition>
+          <name>DEBUG</name>
+          <description>Print extra debugging information in the log.</description>
+          <defaultValue>false</defaultValue>
+        </hudson.model.BooleanParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+  </properties>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>false</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <builders>
+    <hudson.tasks.Shell>
+      <command>#!/bin/sh
+export LANG=en_US.UTF-8
+export WORKSPACE="$PWD"
+
+cd ~/silos/$SILONAME
+
+{BINDIR}/revert.py
+RETVAL=$?
+
+# FIXME: this should be in python to avoid duplication with build job.
+if [ -d ubuntu/ ]; then
+    for DIR in ubuntu/*; do
+        PACKAGE=$(basename $DIR)
+        debdiff ubuntu/${{PACKAGE}}/${{PACKAGE}}_*.dsc ${{PACKAGE}}_*.dsc 2&gt;/dev/null &gt;full_${{PACKAGE}}.diff
+    done
+fi
+
+cp *.diff "$WORKSPACE" 2&gt;/dev/null || true
+
+# ubuntu/ directory only contains distro versions, and only used for diffing.
+# This cuts our disk usage in half:
+rm -rf ubuntu/ build-area/
+
+exit $RETVAL
+</command>
+    </hudson.tasks.Shell>
+  </builders>
+  <publishers>
+    <hudson.tasks.ArtifactArchiver>
+      <artifacts>*.diff</artifacts>
+      <allowEmptyArchive>true</allowEmptyArchive>
+      <onlyIfSuccessful>false</onlyIfSuccessful>
+      <fingerprint>false</fingerprint>
+      <defaultExcludes>true</defaultExcludes>
+    </hudson.tasks.ArtifactArchiver>
+  </publishers>
+  <buildWrappers>
+    <org.jenkinsci.plugins.builduser.BuildUser plugin="build-user-vars-plugin@1.3"/>
+  </buildWrappers>
+</project>

=== added file 'citrain/revert.py'
--- citrain/revert.py	1970-01-01 00:00:00 +0000
+++ citrain/revert.py	2015-03-10 17:39:11 +0000
@@ -0,0 +1,132 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+# Copyright (C) 2015 Canonical
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+"""CI Train Revert Job
+
+Revert distro packages to older versions.
+
+Usage:
+
+1. Prepare a silo, listing the packages to revert as manual source uploads.
+
+2. Run the jenkins 'revert' job, do not run this script locally.
+
+3. Publish the silo as normal.
+
+Environment variables:
+
+SILONAME
+     The silo you've previously prepared to handle your revert.
+
+PACKAGE_VERSIONS
+     The desired versions to revert to, in the form of "foo=1.0 bar=2.0". If
+     you leave this blank, the second-most-recent upload will be chosen.
+
+DEBUG
+    Enable debug infos
+"""
+
+from __future__ import absolute_import, division, unicode_literals
+
+import os
+import sys
+
+sys.path.append(os.path.dirname(os.path.dirname(__file__)))
+
+from cupstream2distro.version import V
+from citrain.merge_clean import MergeManager
+from cupstream2distro.project import DotProject
+from citrain.build import SourceSync, main as build_main
+from cupstream2distro.errors import RevertError
+from cupstream2distro.packagemanager import (
+    get_current_version_for_series,
+    get_source_package,
+    sort_by_date,
+)
+from cupstream2distro.utils import (
+    SILO_DIR,
+    call,
+    env,
+    log_value_of,
+    run_script,
+)
+
+SEPARATOR = '.~is.'
+
+
+class Revert(SourceSync):
+    """Encode the steps necessary to revert a source package."""
+    versions = {}
+
+    def collect_phase(self):
+        known = sort_by_date(
+            self.dest.getPublishedSources(
+                exact_match=True,
+                source_name=self.name,
+                distro_series=self.series,
+                pocket='Release'),
+            all_packages=True)
+        current = known[0].source_package_version
+        ppa_version = get_current_version_for_series(
+            self.name, self.series.name, dest=self.silo_ppa, all_packages=True)
+        ppa_version = ppa_version.partition(SEPARATOR)[0]
+        desired = self.versions.get(self.name)
+        if not desired:
+            try:
+                desired = known[1].source_package_version
+            except IndexError:
+                raise RevertError('No previous version to revert found.')
+        highest = V.max(current, ppa_version)
+        highest = V(highest).create_new(self.series.version)
+        upstream = V(highest).get_upstream()
+        desired_upstream = V(desired).get_upstream()
+        new_version = '{}{}{}-0ubuntu1'.format(
+            upstream, SEPARATOR, desired_upstream)
+        upstream = V(new_version).get_upstream()
+        log_value_of.new_version()
+        from_dir = get_source_package(
+            self.name, self.dest, self.series,
+            path=SILO_DIR(), version=desired)
+        self.delete_old_dsc()
+        self.position_source(from_dir)
+        self.rename_orig_tarball(upstream)
+        call(['dch', '-v', new_version,
+              'Reverting to {} due to regression.'.format(desired)],
+             cwd=self.path)
+        call(['dch', '-r', '-D', self.series.name, '--force-distribution', ''],
+             cwd=self.path)
+        self.initialize_branch()
+        DotProject.soft_save(self.name, dest=current, ours=new_version)
+
+
+class RevertManager(MergeManager):
+    """Orchestrate the reverting of packages."""
+
+    def choose_classes(self):
+        """Revert everything."""
+        self.types = {Revert: self.names}
+        for package in env.PACKAGE_VERSIONS.split():
+            source_name, div, version = package.partition('=')
+            Revert.versions[source_name] = version
+
+
+def main():
+    """Execute the revert."""
+    return build_main(RevertManager)
+
+
+run_script(__name__, __doc__, main)

=== removed file 'citrain/reverter.py'
--- citrain/reverter.py	2015-03-09 23:41:22 +0000
+++ citrain/reverter.py	1970-01-01 00:00:00 +0000
@@ -1,205 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-# Copyright (C) 2014 Canonical
-#
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; version 3.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-from __future__ import absolute_import, division, unicode_literals
-
-import argparse
-import lazr
-import logging
-import os
-import tempfile
-import shutil
-import sys
-import subprocess
-
-sys.path.append(os.path.dirname(os.path.dirname(__file__)))
-
-from six.moves import input as text_input
-
-from cupstream2distro.launchpadmanager import lp
-from cupstream2distro import packagemanager
-from cupstream2distro.packagemanager import newest
-from cupstream2distro.version import V
-from cupstream2distro.utils import os_path_join_safe, run_script
-
-
-def main():
-    # Unlike the rest of the train, reverter is run manually outside
-    # of "silo dirs", so override SILO_DIR() to just be the cwd.
-    packagemanager.SILO_DIR = os.getcwd
-    parser = argparse.ArgumentParser(
-        description="Revert to previous version of the one published in the "
-        "release pocket of selected packages")
-
-    parser.add_argument(
-        'source',
-        nargs='+',
-        help='Source package name. To force a specific version to '
-             'downgrade to, use source=<version>')
-    parser.add_argument(
-        'commitmessage',
-        help='Commit message to use in all packages')
-    parser.add_argument(
-        '--distribution',
-        default='ubuntu',
-        help="The destination distribution (default: ubuntu)")
-    parser.add_argument(
-        '--ppa',
-        help="ppa destination if destination isn't ubuntu archives")
-    parser.add_argument(
-        '--series',
-        help="force a specific series")
-    parser.add_argument(
-        '-d',
-        '--debug',
-        action='store_true',
-        default=False,
-        help="Enable debug infos")
-
-    args = parser.parse_args()
-
-    logging.basicConfig(level=logging.DEBUG if args.debug else logging.INFO,
-                        format="%(asctime)s %(levelname)s %(message)s")
-
-    if args.series:
-        try:
-            series = lp.get_series(args.series, distro_name=args.distribution)
-        except lazr.restfulclient.errors.NotFound:
-            logging.error("{} doesn't exist".format(args.series))
-            return 1
-    else:
-        series = lp.distributions[args.distribution].current_series
-        logging.info(
-            "Taking {} as current destination series".format(series.name))
-
-    if args.ppa:
-        dest = lp.get_ppa(args.ppa)
-    else:
-        dest = lp.distributions[args.distribution].main_archive
-
-    workdir = tempfile.mkdtemp()
-    os.chdir(workdir)
-    upload_dir = os_path_join_safe(workdir, 'upload')
-    latest_dir = os_path_join_safe(workdir, 'latest')
-    os.makedirs(upload_dir)
-    os.makedirs(latest_dir)
-    source_version_revert = {}
-    changes_revert_path = {}
-    for source in args.source:
-        sourceversion = source.split('=')
-        source_package_name = sourceversion[0]
-        try:
-            version_to_downgrade_to = sourceversion[1]
-        except IndexError:
-            # downgrade to previous version than latest published one
-            version_to_downgrade_to = newest(
-                dest.getPublishedSources(
-                    exact_match=True,
-                    source_name=source_package_name,
-                    distro_series=series,
-                    pocket='Release'), n=1).source_package_version
-        source_version_revert[source_package_name] = version_to_downgrade_to
-        logging.info("Downgrading {} to {}".format(
-            source_package_name, version_to_downgrade_to))
-
-    confirmation = text_input(
-        "Commit message will be:\n{}\n\n"
-        "Ok with the versions and commit message above? [y/N] ".format(
-            args.commitmessage))
-    if confirmation.lower() not in ('y', 'yes'):
-        return 1
-
-    for source in source_version_revert:
-        orig_tarball = None
-
-        os.chdir(upload_dir)
-        revert_version = source_version_revert[source]
-        new_version_path = packagemanager.get_source_package_from_dest(
-            source,
-            dest,
-            revert_version,
-            series.name)
-
-        os.chdir(latest_dir)
-        latest_version = packagemanager.get_current_version_for_series(
-            source, series.name, dest=dest)
-        latest_version_path = packagemanager.get_source_package_from_dest(
-            source,
-            dest,
-            latest_version,
-            series.name)
-
-        shutil.copy2(
-            os_path_join_safe(latest_version_path, 'debian', 'changelog'),
-            os_path_join_safe(new_version_path, 'debian', 'changelog'))
-
-        source_upload_dir = os.path.dirname(new_version_path)
-        os.chdir(source_upload_dir)
-        changes_revert_path[source] = source_upload_dir
-
-        for file_name in os.listdir('.'):
-            if ".orig." in file_name:
-                orig_tarball = file_name
-
-        if not orig_tarball:
-            logging.error("Couldn't find original tarball")
-            return 1
-
-        new_orig_tarball = "{}_{}.is.{}.orig.{}".format(
-            source,
-            V(latest_version).get_upstream(),
-            V(revert_version).get_upstream(),
-            orig_tarball.split(".orig.")[-1])
-        os.rename(orig_tarball, new_orig_tarball)
-
-        new_packaging_version = "{}.is.{}-0ubuntu1".format(
-            V(latest_version).get_upstream(epoch=True),
-            V(revert_version).get_upstream())
-        logging.info(
-            "Preparing {} with version {}".format(
-                source, new_packaging_version))
-        os.chdir(new_version_path)
-        if subprocess.call(['dch',
-                            '-v',
-                            new_packaging_version,
-                            args.commitmessage]) != 0:
-            return 1
-        if subprocess.call(['dch',
-                            '-r',
-                            '-D',
-                            series.name,
-                            '--force-distribution',
-                            '']) != 0:
-            return 1
-        if subprocess.call(['debuild', '-S']) != 0:
-            return 1
-
-    print(('=' * 80))
-    subprocess.call("cat {}/*/*/*.changes".format(upload_dir), shell=True)
-    confirmation = text_input('Ok to upload those? [y/N] ')
-    if confirmation.lower() not in ('y', 'yes'):
-        return 1
-
-    for source in changes_revert_path:
-        os.chdir(changes_revert_path[source])
-        subprocess.call("dput *.changes", shell=True)
-
-    shutil.rmtree(workdir)
-    return 0
-
-
-run_script(__name__, __doc__, main)

=== modified file 'citrain/setup_citrain.py'
--- citrain/setup_citrain.py	2015-03-03 09:45:08 +0000
+++ citrain/setup_citrain.py	2015-03-10 17:39:11 +0000
@@ -95,6 +95,7 @@
     setup_job('upgrade-chroot')
     setup_job('apt-get-clean')
     setup_job('pbuilder-clean')
+    setup_job('revert')
     return 0
 
 

=== modified file 'cupstream2distro/errors.py'
--- cupstream2distro/errors.py	2015-03-03 09:45:08 +0000
+++ cupstream2distro/errors.py	2015-03-10 17:39:11 +0000
@@ -51,3 +51,8 @@
 class MergeError(CITrainError):
     """Exception raised when there's a problem with merging."""
     pass
+
+
+class RevertError(CITrainError):
+    """Exception raised when there's a problem with reverting."""
+    pass

=== modified file 'cupstream2distro/packagemanager.py'
--- cupstream2distro/packagemanager.py	2015-03-09 23:41:22 +0000
+++ cupstream2distro/packagemanager.py	2015-03-10 17:39:11 +0000
@@ -157,7 +157,7 @@
 
 
 # TODO: Integrate these functions into Package class.
-def get_source_package(source_name, dest, series, path=None):
+def get_source_package(source_name, dest, series, path=None, version=None):
     """Download the latest version of a package in an ubuntu archive.
 
     :param source_name: String name of the source package to download.
@@ -165,14 +165,19 @@
     :param series: LP distro_series object representing eg vivid, utopic, etc.
     :param path: Absolute path where you want files downloaded.
                  Defaults to SILO_DIR()/ubuntu/source_name.
+    :param version: The version you want to download. Leave blank for newest.
     :returns: The path to the source tree (subdir of path param), or None.
     """
     path = path or SILO_DIR('ubuntu', source_name)
     with suppress(OSError):
         os.makedirs(path)
 
-    source = newest(dest.getPublishedSources(
-        exact_match=True, source_name=source_name, distro_series=series))
+    kwargs = dict(
+        exact_match=True, source_name=source_name, distro_series=series)
+    if version:
+        kwargs.update(version=version)
+    source = newest(
+        dest.getPublishedSources(**kwargs), all_packages=bool(version))
     if not source:
         logging.warning('{} not found in {}.'.format(source_name, dest.name))
         return None
@@ -237,66 +242,6 @@
         status=queue).total_size > 0
 
 
-# FIXME: Only used by reverter.py; this should be deleted and
-# reverter.py ported to get_source_package().
-def get_source_package_from_dest(source_name,
-                                 dest_archive,
-                                 dest_current_version,
-                                 series_name,
-                                 download_dir='ubuntu'):
-    """Download and return a path containing the current dest version.
-
-    None if this package was never published to dest archive.
-    """
-    if dest_current_version == "0":
-        logging.info(
-            "This package was never released to the destination archive, "
-            "don't return downloaded source")
-        return None
-
-    logging.info('Downloading {} {} from {} to the "{}" directory.'.format(
-        source_name, dest_current_version, series_name, download_dir))
-    source_package_download_dir = os_path_join_safe(
-        SILO_DIR(), download_dir, source_name)
-    series = lp.get_series(series_name, dest=dest_archive)
-    with suppress(OSError):
-        os.makedirs(source_package_download_dir)
-
-    sourcepkg = newest(dest_archive.getPublishedSources(
-        exact_match=True,
-        source_name=source_name,
-        distro_series=series,
-        version=dest_current_version), all_packages=True)
-    if not sourcepkg:
-        raise Exception("Couldn't get in the destination the expected version")
-    for url in sourcepkg.sourceFileUrls():
-        filename = unquote(url.split('/')[-1])
-        filepath = os_path_join_safe(source_package_download_dir, filename)
-        urlretrieve(url, filepath)
-    dscs = glob(os_path_join_safe(
-        source_package_download_dir, '*{}.dsc'.format(
-            dest_current_version.split(':')[-1])))
-    instance, stdout, stderr = call(
-        ['dpkg-source', '-x'] + dscs, cwd=source_package_download_dir)
-    if instance.returncode != 0:
-        raise Exception(stderr)
-
-    # check the dir exist
-    # remove epoch is there is one
-    splitted_version = dest_current_version.split(':')[-1].split('-')
-    if len(splitted_version) > 1:
-        # we don't want the ubuntu or debian version (it's not in the source
-        # package name)
-        splitted_version = splitted_version[:-1]
-    version_for_source_file = '-'.join(splitted_version)
-    source_dirname = os_path_join_safe(
-        source_package_download_dir, '{}-{}'.format(
-            source_name, version_for_source_file))
-    if not os.path.isdir(source_dirname):
-        raise Exception(source_dirname + ': Directory not found')
-    return source_dirname
-
-
 def _packaging_changes_between_dsc(oldsource_dsc, newsource_dsc):
     """Return if there has been a packaging change between two dsc files.
 

=== modified file 'tests/unit/__init__.py'
--- tests/unit/__init__.py	2015-03-09 23:41:22 +0000
+++ tests/unit/__init__.py	2015-03-10 17:39:11 +0000
@@ -193,6 +193,8 @@
             self.script.Package = Mock()
             self.script.Revno = Mock()
             self.script.SiloState = Mock()
+            self.script.call = Mock()
+            self.script.log_call = Mock()
             self.script.branchhandling = Mock()
             self.script.bh = Mock()
             self.script.glob = Mock()

=== modified file 'tests/unit/test_packagemanager.py'
--- tests/unit/test_packagemanager.py	2015-03-09 23:41:22 +0000
+++ tests/unit/test_packagemanager.py	2015-03-10 17:39:11 +0000
@@ -17,7 +17,6 @@
 from __future__ import absolute_import, division, unicode_literals
 
 import os
-import shutil
 
 from six.moves.urllib.parse import quote
 from six.moves import cStringIO as StringIO
@@ -30,7 +29,7 @@
 
 from cupstream2distro import packagemanager
 from cupstream2distro.packagemanager import Package
-from cupstream2distro.utils import env, os_path_join_safe, utf8_open
+from cupstream2distro.utils import os_path_join_safe, utf8_open
 from cupstream2distro.errors import CITrainError, PackageError
 
 
@@ -255,7 +254,7 @@
         dest.getPublishedSources.assert_called_once_with(
             exact_match=True, source_name='flubjub', distro_series=series)
         new.assert_called_once_with(
-            dest.getPublishedSources.return_value)
+            dest.getPublishedSources.return_value, all_packages=False)
         source.sourceFileUrls.assert_called_once_with()
         urlM.assert_called_once_with(
             'http://example.com/flubjub_1.0+15.04.20150218.dsc',
@@ -291,7 +290,7 @@
         dest.getPublishedSources.assert_called_once_with(
             exact_match=True, source_name='flubjub', distro_series=series)
         new.assert_called_once_with(
-            dest.getPublishedSources.return_value)
+            dest.getPublishedSources.return_value, all_packages=False)
         source.sourceFileUrls.assert_called_once_with()
         urlM.assert_called_once_with(
             'http://example.com/flubjub_1.0+15.04.20150218.dsc',
@@ -327,7 +326,7 @@
         dest.getPublishedSources.assert_called_once_with(
             exact_match=True, source_name='flubjub', distro_series=series)
         new.assert_called_once_with(
-            dest.getPublishedSources.return_value)
+            dest.getPublishedSources.return_value, all_packages=False)
         source.sourceFileUrls.assert_called_once_with()
         urlM.assert_called_once_with(
             'http://example.com/flubjub_1.0+15.04.20150218.dsc',
@@ -361,7 +360,7 @@
         dest.getPublishedSources.assert_called_once_with(
             exact_match=True, source_name='flubjub', distro_series=series)
         new.assert_called_once_with(
-            dest.getPublishedSources.return_value)
+            dest.getPublishedSources.return_value, all_packages=False)
         self.assertEqual(source.sourceFileUrls.mock_calls, [])
         self.assertEqual(urlM.mock_calls, [])
         self.assertEqual(callM.mock_calls, [])
@@ -484,231 +483,6 @@
             if filename.endswith('.dsc'):
                 return filename
 
-    @patch('cupstream2distro.packagemanager.lp')
-    def test_get_source_package_from_dest(self, lpMock):
-        """We grab the correct source from dest."""
-        env.SILONAME = 'ubuntu/landing-234'
-        dest = Mock()
-        dest.distribution.name = 'ubuntu'
-        source1 = Mock()
-        source1.status = 'Published'
-        dest.getPublishedSources.return_value = [source1]
-        source1.sourceFileUrls.return_value = (
-            self.get_source_files_for_package(
-                'foo_package', for_download=True))
-
-        source_package_dir = packagemanager.get_source_package_from_dest(
-            'foo', dest, '42.0daily83.09.13.2-0ubuntu1', 'rolling')
-
-        lpMock.get_series.assert_called_with('rolling', dest=dest)
-        dest.getPublishedSources.assert_called_once_with(
-            exact_match=True,
-            source_name='foo',
-            distro_series=lpMock.get_series.return_value,
-            version='42.0daily83.09.13.2-0ubuntu1')
-        source1.sourceFileUrls.assert_called_once()
-        self.assertTrue(os.path.isdir(source_package_dir))
-
-    @patch('cupstream2distro.packagemanager.lp')
-    def test_get_source_package_from_dest_two_foo_packages(self, lpMock):
-        """Only unpack the right source package by version."""
-        env.SILONAME = 'ubuntu/landing-123'
-        dest1 = Mock()
-        dest1.distribution.name = 'ubuntu'
-        source1 = Mock()
-        source1.status = 'Published'
-        dest2 = Mock()
-        dest2.distribution.name = 'ubuntu'
-        source2 = Mock()
-        source2.status = 'Published'
-        dest1.getPublishedSources.return_value = [source1]
-        dest2.getPublishedSources.return_value = [source2]
-        source1.sourceFileUrls.return_value = (
-            self.get_source_files_for_package(
-                'foo_package', for_download=True))
-        source2.sourceFileUrls.return_value = (
-            self.get_source_files_for_package(
-                'foo_package_with_upstream_changes', for_download=True))
-
-        source_package_dir1 = packagemanager.get_source_package_from_dest(
-            'foo', dest1, '42.0daily83.09.13.2-0ubuntu1', 'rolling')
-        self.assertTrue(os.path.isdir(source_package_dir1))
-
-        # to make sure that it's not extracting both .dsc's during the
-        # get_source_package_from_dest step
-        shutil.rmtree(source_package_dir1)
-
-        source_package_dir2 = packagemanager.get_source_package_from_dest(
-            'foo', dest2, '42.0+13.10.20130709-0ubuntu1', 'rolling')
-        self.assertFalse(os.path.isdir(source_package_dir1))
-        self.assertTrue(os.path.isdir(source_package_dir2))
-
-    @patch('cupstream2distro.packagemanager.lp')
-    def test_get_source_package_from_dest_multiple_candidates(self, lpMock):
-        """We grab the correct source from dest, even if more than one."""
-        env.SILONAME = 'hello'
-        dest = Mock()
-        dest.distribution.name = 'ubuntu'
-        source1 = Mock()
-        source1.status = 'Published'
-        source1.date_created = datetime(2014, 1, 1)
-        source2 = Mock()
-        source2.status = 'Published'
-        source2.date_created = datetime(2014, 2, 1)
-        dest.getPublishedSources.return_value = [source1, source2]
-        source2.sourceFileUrls.return_value = (
-            self.get_source_files_for_package(
-                'foo_package', for_download=True))
-
-        source_package_dir = packagemanager.get_source_package_from_dest(
-            'foo', dest, '42.0daily83.09.13.2-0ubuntu1', 'rolling')
-
-        lpMock.get_series.assert_called_with('rolling', dest=dest)
-        dest.getPublishedSources.assert_called_once_with(
-            exact_match=True,
-            source_name='foo',
-            distro_series=lpMock.get_series.return_value,
-            version='42.0daily83.09.13.2-0ubuntu1')
-        source2.sourceFileUrls.assert_called_once()
-        self.assertFalse(source1.sourceFileUrls.called)
-        self.assertTrue(os.path.isdir(source_package_dir))
-
-    @patch('cupstream2distro.packagemanager.lp')
-    def test_get_source_package_from_dest_with_epoc(self, lpMock):
-        """We grab the correct source from dest with epoch."""
-        env.SILONAME = 'i-am-an-invalid-silo-name-but-thats-ok'
-        dest = Mock()
-        dest.distribution.name = 'ubuntu'
-        source1 = Mock()
-        source1.status = 'Published'
-        dest.getPublishedSources.return_value = [source1]
-        source1.sourceFileUrls.return_value = (
-            self.get_source_files_for_package(
-                'foo_package', for_download=True))
-
-        source_package_dir = packagemanager.get_source_package_from_dest(
-            'foo', dest, '1:42.0daily83.09.13.2-0ubuntu1', 'rolling')
-
-        lpMock.get_series.assert_called_with('rolling', dest=dest)
-        dest.getPublishedSources.assert_called_once_with(
-            exact_match=True,
-            source_name='foo',
-            distro_series=lpMock.get_series.return_value,
-            version='1:42.0daily83.09.13.2-0ubuntu1')
-        source1.sourceFileUrls.assert_called_once()
-        self.assertTrue(os.path.isdir(source_package_dir))
-        self.assertNotIn(':', source_package_dir)
-
-    @patch('cupstream2distro.packagemanager.lp')
-    def test_get_source_package_from_dest_for_native(self, lpMock):
-        """We grab the correct source from dest for native packages."""
-        env.SILONAME = 'frumpbuntu/flailing-987'
-        dest = Mock()
-        dest.distribution.name = 'ubuntu'
-        source1 = Mock()
-        source1.status = 'Published'
-        dest.getPublishedSources.return_value = [source1]
-        source1.sourceFileUrls.return_value = (
-            self.get_source_files_for_package(
-                'foo_native_package', for_download=True))
-
-        source_package_dir = packagemanager.get_source_package_from_dest(
-            'foo', dest, '42.0daily83.09.13.2', 'rolling')
-
-        lpMock.get_series.assert_called_with('rolling', dest=dest)
-        dest.getPublishedSources.assert_called_once_with(
-            exact_match=True,
-            source_name='foo',
-            distro_series=lpMock.get_series.return_value,
-            version='42.0daily83.09.13.2')
-        source1.sourceFileUrls.assert_called_once()
-        self.assertTrue(os.path.isdir(source_package_dir))
-
-    @patch('cupstream2distro.packagemanager.lp')
-    def test_get_source_package_from_dest_with_debian_version(
-            self, lpMock):
-        """We grab the correct source from dest with only a debian version."""
-        env.SILONAME = 'ubuntu/landing-000'
-        dest = Mock()
-        dest.distribution.name = 'ubuntu'
-        source1 = Mock()
-        source1.status = 'Published'
-        dest.getPublishedSources.return_value = [source1]
-        source1.sourceFileUrls.return_value = (
-            self.get_source_files_for_package(
-                'foo_debian_package', for_download=True))
-
-        source_package_dir = packagemanager.get_source_package_from_dest(
-            'foo', dest, '42.0daily83.09.13.2-1', 'rolling')
-
-        lpMock.get_series.assert_called_with('rolling', dest=dest)
-        dest.getPublishedSources.assert_called_once_with(
-            exact_match=True,
-            source_name='foo',
-            distro_series=lpMock.get_series.return_value,
-            version='42.0daily83.09.13.2-1')
-        source1.sourceFileUrls.assert_called_once()
-        self.assertTrue(os.path.isdir(source_package_dir))
-
-    @patch('cupstream2distro.packagemanager.lp')
-    def test_get_source_package_from_dest_with_special_chars(
-            self, lpMock):
-        """Grab the correct source from dest with chars like ~ and +."""
-        env.SILONAME = 'ubuntu/landing-000'
-        dest = Mock()
-        dest.distribution.name = 'ubuntu'
-        source1 = Mock()
-        source1.status = 'Published'
-        dest.getPublishedSources.return_value = [source1]
-        source1.sourceFileUrls.return_value = (
-            self.get_source_files_for_package(
-                'foo_specialchars_package', for_download=True))
-
-        source_package_dir = packagemanager.get_source_package_from_dest(
-            'foo', dest, '42.0~daily83.09.13.2+0-0ubuntu1', 'rolling')
-
-        lpMock.get_series.assert_called_once_with('rolling', dest=dest)
-        dest.getPublishedSources.assert_called_once_with(
-            exact_match=True,
-            source_name='foo',
-            distro_series=lpMock.get_series.return_value,
-            version='42.0~daily83.09.13.2+0-0ubuntu1')
-        source1.sourceFileUrls.assert_called_once()
-        self.assertTrue(os.path.isdir(source_package_dir))
-
-    @patch('cupstream2distro.packagemanager.lp')
-    def test_get_source_package_from_dest_not_published(self, lpMock):
-        """We return none if the package was never published into the dest."""
-        self.assertIsNone(packagemanager.get_source_package_from_dest(
-            'foo', None, '0', 'rolling'))
-        self.assertEqual(os.listdir('.'), [])
-        self.assertFalse(lpMock.get_series.called)
-
-    @patch('cupstream2distro.packagemanager.lp')
-    def test_get_source_package_from_dest_with_ubuntu_native_version(
-            self, lpMock):
-        """We grab the correct source from dest with ubuntu native version."""
-        dest = Mock()
-        dest.distribution.name = 'ubuntu'
-        source1 = Mock()
-        source1.status = 'Published'
-        dest.getPublishedSources.return_value = [source1]
-        source1.sourceFileUrls.return_value = (
-            self.get_source_files_for_package(
-                'foo_native_ubuntu_version', for_download=True))
-
-        source_package_dir = packagemanager.get_source_package_from_dest(
-            'foo', dest, '42ubuntu1', 'rolling')
-
-        lpMock.get_series.assert_called_once_with('rolling', dest=dest)
-        dest.getPublishedSources.assert_called_once_with(
-            exact_match=True,
-            source_name='foo',
-            distro_series=lpMock.get_series.return_value,
-            version='42ubuntu1')
-        source1.sourceFileUrls.assert_called_once()
-        self.assertTrue(os.path.isdir(source_package_dir))
-
     def test_detect_packaging_changes_since_last_release(self):
         """We detect packaging changes since last release."""
         self.assertTrue(

=== modified file 'tests/unit/test_script_build.py'
--- tests/unit/test_script_build.py	2015-03-09 23:41:22 +0000
+++ tests/unit/test_script_build.py	2015-03-10 17:39:11 +0000
@@ -791,7 +791,6 @@
         from_archive = self.script.SourceSync.from_archive = Mock()
         self.script.pm.get_current_version_for_series\
             .return_value = '1.9+15.04.20150208-0ubuntu1'
-        self.script.pm.version_greater_equal.return_value = True
         globs = [
             [self.tempdir + '/sink_1.9.orig.tar.gz'],
             [self.tempdir + '/sink_1.9.dsc'],
@@ -1015,7 +1014,7 @@
         self.script.env.WATCH_ONLY = 'false'
         silo_state = self.script.SiloState.return_value
         bm = self.script.BuildManager = Mock()
-        self.assertEqual(self.script.main(), 0)
+        self.assertEqual(self.script.main(bm), 0)
         bm.assert_called_once_with(silo_state)
         self.assertEqual(
             bm.return_value.mock_calls, [
@@ -1030,7 +1029,7 @@
         self.script.env.WATCH_ONLY = 'true'
         silo_state = self.script.SiloState.return_value
         bm = self.script.BuildManager = Mock()
-        self.assertEqual(self.script.main(), 0)
+        self.assertEqual(self.script.main(bm), 0)
         bm.assert_called_once_with(silo_state)
         self.assertEqual(
             bm.return_value.mock_calls, [
@@ -1049,7 +1048,7 @@
         silo_state = self.script.SiloState.return_value
         bm = self.script.BuildManager = Mock()
         bm.return_value.do = Mock(side_effect=raise_errs)
-        self.assertEqual(self.script.main(), 1)
+        self.assertEqual(self.script.main(bm), 1)
         bm.assert_called_once_with(silo_state)
         self.assertEqual(
             bm.return_value.mock_calls, [

=== renamed file 'tests/unit/test_script_reverter.py' => 'tests/unit/test_script_revert.py'
--- tests/unit/test_script_reverter.py	2015-03-03 09:45:08 +0000
+++ tests/unit/test_script_revert.py	2015-03-10 17:39:11 +0000
@@ -16,13 +16,95 @@
 
 from __future__ import absolute_import, division, unicode_literals
 
+from datetime import datetime
+from mock import Mock, call
+
 from tests.unit import CITrainScriptTestCase
+from cupstream2distro.errors import RevertError
 
 # Unused import necessary for code coverage reporting
-from citrain import reverter
-reverter
+from citrain import revert
+revert
 
 
 class ReverterTestCase(CITrainScriptTestCase):
     """Test the CI Train Reverter script."""
-    scriptname = 'reverter.py'
+    scriptname = 'revert.py'
+
+    def test_revert_collect_phase(self):
+        """Ensure that Revert class can get packages to revert to."""
+        today = datetime.today().strftime('%Y%m%d')
+        s1 = Mock(source_package_version='2.0')
+        s2 = Mock(source_package_version='1.0')
+        self.script.sort_by_date = Mock(return_value=[s1, s2])
+        self.script.get_current_version_for_series = Mock(return_value='0')
+        self.script.get_source_package = Mock()
+        series = Mock(version='15.04')
+        dest = Mock()
+        ppa = Mock()
+        revert = self.script.Revert('regress', series, dest, ppa)
+        revert.delete_old_dsc = Mock()
+        revert.position_source = Mock()
+        revert.rename_orig_tarball = Mock()
+        revert.initialize_branch = Mock()
+        revert.collect_phase()
+        self.script.sort_by_date.assert_called_once_with(
+            revert.dest.getPublishedSources.return_value, all_packages=True)
+        self.assertEqual(revert.dest.getPublishedSources.mock_calls, [
+            call(exact_match=True, source_name='regress',
+                 distro_series=series, pocket='Release'),
+        ])
+        self.script.get_current_version_for_series.assert_called_once_with(
+            'regress', series.name, dest=ppa, all_packages=True)
+        self.script.get_source_package.assert_called_once_with(
+            'regress', dest, series, path=self.tempdir, version='1.0')
+        revert.delete_old_dsc.assert_called_once_with()
+        revert.position_source.assert_called_once_with(
+            self.script.get_source_package.return_value)
+        new_version = '2.0+15.04.{}.~is.1.0'.format(today)
+        revert.rename_orig_tarball.assert_called_once_with(new_version)
+        self.assertEqual(self.script.call.mock_calls, [
+            call(['dch', '-v', new_version + '-0ubuntu1',
+                  'Reverting to 1.0 due to regression.'], cwd=revert.path),
+            call(['dch', '-r', '-D', series.name, '--force-distribution', ''],
+                 cwd=revert.path),
+        ])
+        revert.initialize_branch.assert_called_once_with()
+        self.script.DotProject.soft_save.assert_called_once_with(
+            'regress', dest='2.0', ours=new_version + '-0ubuntu1')
+
+    def test_revert_collect_phase_none_found(self):
+        """Raise the correct error when there's no previous version."""
+        s1 = Mock(source_package_version='2.0')
+        self.script.sort_by_date = Mock(return_value=[s1])
+        self.script.get_current_version_for_series = Mock(return_value='0')
+        self.script.get_source_package = Mock()
+        series = Mock(version='15.04')
+        dest = Mock()
+        ppa = Mock()
+        revert = self.script.Revert('regress', series, dest, ppa)
+        with self.assertRaisesRegexp(RevertError, 'No previous version'):
+            revert.collect_phase()
+
+    def test_revert_manager_choose_classes(self):
+        """Ensure that RevertManager chooses all packages to revert."""
+        self.script.env.PACKAGE_VERSIONS = 'foo=1.0 bar=2.0'
+        silo_state = Mock()
+        rm = self.script.RevertManager(silo_state)
+        rm.names = Mock()
+        rm.choose_classes()
+        self.assertEqual(rm.types, {
+            self.script.Revert: rm.names,
+        })
+        self.assertEqual(self.script.Revert.versions, {
+            'foo': '1.0',
+            'bar': '2.0',
+        })
+
+    def test_main(self):
+        """Ensure main() triggers everything."""
+        self.script.build_main = Mock()
+        self.assertEqual(
+            self.script.main(), self.script.build_main.return_value)
+        self.script.build_main.assert_called_once_with(
+            self.script.RevertManager)

=== modified file 'tests/unit/test_script_setup_citrain.py'
--- tests/unit/test_script_setup_citrain.py	2015-03-03 09:45:08 +0000
+++ tests/unit/test_script_setup_citrain.py	2015-03-10 17:39:11 +0000
@@ -163,7 +163,8 @@
             call('check-publication-migration'),
             call('upgrade-chroot'),
             call('apt-get-clean'),
-            call('pbuilder-clean')])
+            call('pbuilder-clean'),
+            call('revert')])
 
     def test_integration(self):
         """A basic integration test for jenkins config deployment."""
@@ -175,6 +176,7 @@
             'check-publication-migration/config.xml',
             'pbuilder-clean/config.xml',
             'prepare-silo/config.xml',
+            'revert/config.xml',
             'ubuntu-landing-000-0-reconfigure/config.xml',
             'ubuntu-landing-000-1-build/config.xml',
             'ubuntu-landing-000-2-publish/config.xml',