Merge lp:~robru/cupstream2distro/more-strict-gles into lp:cupstream2distro

[Robert Bruce Park]

Force GLES twins to keep versions in lock-step.

[Robert Bruce Park (robru)]

Looks great in staging.

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'citrain/build.py'
--- citrain/build.py	2015-09-24 00:12:08 +0000
+++ citrain/build.py	2015-10-09 17:56:49 +0000
@@ -30,9 +30,6 @@
 FORCE_REBUILD
     Force rebuilding an MP even if there is no diff with dest.
 
-IGNORE_MISSING_TWINS
-    Don't enforce building a -gles twin for packages that usually have it.
-
 TAKE_WHOLE_COMMIT_MESSAGE
     Use whole commit message in changelog, not just the brief part.
 
@@ -53,6 +50,7 @@
 from glob import glob
 from os.path import basename
 
+from citrain.recipes.base import missing
 from citrain.recipes.manager import Manager
 from cupstream2distro.silomanager import SiloState
 from cupstream2distro.errors import BuildError, CITrainError
@@ -80,6 +78,7 @@
         """Decide which packages need to be built."""
         self.names = set(env.PACKAGES_TO_REBUILD.split()
                          or self.silo_state.all_projects)
+        self.names.update(missing(self.names))
         include_all = 'true' in (env.FORCE_REBUILD, env.WATCH_ONLY)
         if not (include_all or env.PACKAGES_TO_REBUILD):
             # Don't rebuild existing builds without forcing.

=== modified file 'citrain/jenkins-templates/build.xml.tmpl'
--- citrain/jenkins-templates/build.xml.tmpl	2015-09-21 21:43:37 +0000
+++ citrain/jenkins-templates/build.xml.tmpl	2015-10-09 17:56:49 +0000
@@ -39,11 +39,6 @@
           <defaultValue>false</defaultValue>
         </hudson.model.BooleanParameterDefinition>
         <hudson.model.BooleanParameterDefinition>
-          <name>IGNORE_MISSING_TWINS</name>
-          <description>(Usually irrelevant) Ignore missing 'twin' packages for the selected list (like those having -gles duplicates).</description>
-          <defaultValue>false</defaultValue>
-        </hudson.model.BooleanParameterDefinition>
-        <hudson.model.BooleanParameterDefinition>
           <name>TAKE_WHOLE_COMMIT_MESSAGE</name>
           <description>Use whole commit message when generating changelog, not just the brief part.</description>
           <defaultValue>false</defaultValue>

=== modified file 'citrain/recipes/base.py'
--- citrain/recipes/base.py	2015-10-02 06:00:12 +0000
+++ citrain/recipes/base.py	2015-10-09 17:56:49 +0000
@@ -89,6 +89,11 @@
 TWINS.update({v: k for k, v in TWINS.items()})
 
 
+def missing(names):
+    """Identify which twins are missing."""
+    return [TWINS[n] for n in names if n in TWINS and not TWINS[n] in names]
+
+
 DO_NOT_PUBLISH = {'failed', 'error', 'dirty'}
 BUILD_FAILURES = (
     'Build for superseded Source',
@@ -170,15 +175,11 @@
         :param source_names: List of debian source package names in this silo.
         :raises BuildError: If required twin packages are missing.
         """
-        if env.IGNORE_MISSING_TWINS == 'true':
-            logging.warning('Honoring your request to ignore missing twins.')
-        else:
-            missing = [TWINS[s] for s in source_names
-                       if s in TWINS and not TWINS[s] in source_names]
-            if missing:
-                raise BuildError(
-                    'Silo config is missing these packages: {}'.format(
-                        ', '.join(missing)))
+        names = missing(source_names)
+        if names:
+            raise BuildError(
+                'Silo config is missing these packages: {}'.format(
+                    ', '.join(names)))
 
     @staticmethod
     def post_validate_phase(silo_state):

=== modified file 'tests/unit/test_recipe_base.py'
--- tests/unit/test_recipe_base.py	2015-10-02 06:00:12 +0000
+++ tests/unit/test_recipe_base.py	2015-10-09 17:56:49 +0000
@@ -97,26 +97,18 @@
 
     def test_validate_twin_packages(self):
         """Prevent build from continuing if twins are missing."""
-        env.IGNORE_MISSING_TWINS = ''
         with self.assertRaisesRegexp(CITrainError, 'packages: qtmir-gles'):
             BuildBase.validate_twin_packages(
                 ['qtmir', 'qtubuntu', 'qtubuntu-gles'])
 
     def test_validate_twin_packages_reverse(self):
         """Prevent build from continuing if reverse twins are missing."""
-        env.IGNORE_MISSING_TWINS = ''
         with self.assertRaisesRegexp(CITrainError, 'packages: qtmir'):
             BuildBase.validate_twin_packages(
                 ['qtmir-gles', 'qtubuntu', 'qtubuntu-gles'])
 
-    def test_validate_twin_packages_ignored(self):
-        """Allow build to continue even if twins are missing."""
-        env.IGNORE_MISSING_TWINS = 'true'
-        BuildBase.validate_twin_packages(['qtmir', 'qtubuntu'])
-
     def test_validate_twin_packages_approved(self):
         """Allow build to continue when no twins are missing."""
-        env.IGNORE_MISSING_TWINS = ''
         BuildBase.validate_twin_packages(['qtmir', 'qtmir-gles'])
         BuildBase.validate_twin_packages(['foo', 'bar'])
         BuildBase.validate_twin_packages(

=== modified file 'tests/unit/test_script_build.py'
--- tests/unit/test_script_build.py	2015-09-24 05:23:10 +0000
+++ tests/unit/test_script_build.py	2015-10-09 17:56:49 +0000
@@ -103,6 +103,16 @@
         bman.choose_packages()
         self.assertEqual(bman.names, set(['a', 'b']))
 
+    def test_buildmanager_choose_packages_twins(self):
+        """Always add twins for all builds."""
+        sources = ['qtmir', 'qtmir-gles', 'foo']
+        silo_state = Mock(all_projects=sources, sources=sources)
+        self.script.env.PACKAGES_TO_REBUILD = 'qtmir'
+        self.script.env.FORCE_REBUILD = 'false'
+        bman = self.script.BuildManager(silo_state)
+        bman.choose_packages()
+        self.assertEqual(bman.names, set(['qtmir', 'qtmir-gles']))
+
     def test_buildmanager_choose_packages_none_found(self):
         """Fail when no packages to act upon."""
         silo_state = Mock(