Merge lp:~fginther/cupstream2distro-config/use-stack-ppa-option into lp:cupstream2distro-config

[Francis Ginther]

Add 'use_stack_ppa' option (default True) to indicate that the stack's ppa value should be automatically added to the hook list.

Add 'use_stack_ppa' option (default True) to indicate that the stack's ppa value should be automatically added to the hook list.

Tested by dumping results to file with and without the change. Projects that continue to use the default were unchanged. Projects (like unity8) had the appropriate change made to the hooks.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:563
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/397/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-saucy-amd64-ci/195/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/cupstream2distro-config-ci/397/rebuild

review: Needs Fixing (continuous-integration)

[lp:~fginther/cupstream2distro-config/use-stack-ppa-option]

564. By Francis Ginther on 2013-07-29

Fix and add tests for use_stack_ppa.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:564
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/398/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-saucy-amd64-ci/196

Click here to trigger a rebuild:
http://s-jenkins:8080/job/cupstream2distro-config-ci/398/rebuild

review: Approve (continuous-integration)

[Chris Gagnon (chris.gagnon)]

 'use_stack_ppa': False needs to be in a test.

review: Needs Fixing

[lp:~fginther/cupstream2distro-config/use-stack-ppa-option]

565. By Francis Ginther on 2013-07-30

Add a test case for use_stack_ppa == False.

[Francis Ginther (fginther)]

> 'use_stack_ppa': False needs to be in a test.

Good catch, tests are update.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:565
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/404/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-saucy-amd64-ci/202

Click here to trigger a rebuild:
http://s-jenkins:8080/job/cupstream2distro-config-ci/404/rebuild

review: Approve (continuous-integration)

[Chris Gagnon (chris.gagnon)]

thanks lgtm

review: Approve

=== modified file 'c2dconfigutils/cu2dUpdateCi.py'
--- c2dconfigutils/cu2dUpdateCi.py	2013-06-11 21:23:10 +0000
+++ c2dconfigutils/cu2dUpdateCi.py	2013-07-30 17:07:24 +0000
@@ -85,6 +85,7 @@
         'rebuild',
         'team',
         'use_description_for_commit',
+        'use_stack_ppa',
     ]
 
     DEFAULT_HOOK_LOCATION = '/tmp/$JOB_NAME-hooks'
@@ -191,11 +192,12 @@
         if job_data.get('stack_ppa', False):
             stack_ppa_hook = self.GENERATED_HOOK_TEMPLATE.format(
                 job_data['stack_ppa'].replace('/', '~'))
-            if project_config.get('hooks', False):
-                project_config['hooks'] = ' '.join([stack_ppa_hook,
-                                                    project_config['hooks']])
-            else:
-                project_config['hooks'] = stack_ppa_hook
+            if project_config.get('use_stack_ppa', False):
+                if project_config.get('hooks', False):
+                    project_config['hooks'] = ' '.join(
+                        [stack_ppa_hook, project_config['hooks']])
+                else:
+                    project_config['hooks'] = stack_ppa_hook
 
         # Rename hooks parameter for builder jobs
         if builder_job and 'hooks' in project_config:

=== modified file 'ci/config/defaults.conf'
--- ci/config/defaults.conf	2013-05-03 05:44:25 +0000
+++ ci/config/defaults.conf	2013-07-30 17:07:24 +0000
@@ -4,6 +4,7 @@
     autolanding_template: autolanding-config.xml.tmpl
     build_template: pbuilder-config.xml.tmpl
     hooks: ''
+    use_stack_ppa: True
     packaging_branch: '' 
     use_description_for_commit: False
     ci:

=== modified file 'stacks/head/unity8.cfg'
--- stacks/head/unity8.cfg	2013-07-24 10:17:45 +0000
+++ stacks/head/unity8.cfg	2013-07-30 17:07:24 +0000
@@ -38,6 +38,7 @@
   projects:
     unity8:
       hooks: H05set_package_version D00mbs_archive A10checklicenseheaders
+      use_stack_ppa: False
       test_suite: unity8
       aggregate_tests: generic-mediumtests-saucy unity-phablet-qmluitests-saucy
       archive_artifacts: '**/*test*.xml, **/coverage*.xml'

=== modified file 'tests/test_cu2dUpdateCi.py'
--- tests/test_cu2dUpdateCi.py	2013-06-11 21:23:10 +0000
+++ tests/test_cu2dUpdateCi.py	2013-07-30 17:07:24 +0000
@@ -191,11 +191,13 @@
             self.assertEqual(expected, actual)
 
     def test_project_config_stack_ppa(self):
-        config = {'hooks': 'my_hook'}
+        config = {'hooks': 'my_hook',
+                  'use_stack_ppa': True}
         job_data = {'stack_ppa': 'ppa_team/ppa_name'}
         expected = {'target_branch': 'lp:project',
                     'project_name': 'project',
                     'hooks': 'D09add_ppa~ppa_team~ppa_name my_hook',
+                    'use_stack_ppa': True,
                     'parameter_list': [
                         JobParameter('hooks',
                                      'D09add_ppa~ppa_team~ppa_name my_hook'),
@@ -207,12 +209,50 @@
                                                        job_data)
         self.assertEqual(expected, actual)
 
+    def test_project_config_stack_false_use_stack_ppa(self):
+        config = {'hooks': 'my_hook',
+                  'use_stack_ppa': False}
+        job_data = {'stack_ppa': 'ppa_team/ppa_name'}
+        expected = {'target_branch': 'lp:project',
+                    'project_name': 'project',
+                    'hooks': 'my_hook',
+                    'use_stack_ppa': False,
+                    'parameter_list': [
+                        JobParameter('hooks',
+                                     'my_hook'),
+                        JobParameter('target_branch',
+                                     'lp:project'),
+                        JobParameter('project_name',
+                                     'project')]}
+        actual = self.update_ci.process_project_config('project', config,
+                                                       job_data)
+        self.assertEqual(expected, actual)
+
+    def test_project_config_stack_no_use_stack_ppa(self):
+        config = {'hooks': 'my_hook'}
+        job_data = {'stack_ppa': 'ppa_team/ppa_name'}
+        expected = {'target_branch': 'lp:project',
+                    'project_name': 'project',
+                    'hooks': 'my_hook',
+                    'parameter_list': [
+                        JobParameter('hooks',
+                                     'my_hook'),
+                        JobParameter('target_branch',
+                                     'lp:project'),
+                        JobParameter('project_name',
+                                     'project')]}
+        actual = self.update_ci.process_project_config('project', config,
+                                                       job_data)
+        self.assertEqual(expected, actual)
+
     def test_project_config_stack_ppa_with_no_hooks(self):
-        config = {'hooks': ''}
+        config = {'hooks': '',
+                  'use_stack_ppa': True}
         job_data = {'stack_ppa': 'ppa_team/ppa_name'}
         expected = {'target_branch': 'lp:project',
                     'project_name': 'project',
                     'hooks': 'D09add_ppa~ppa_team~ppa_name',
+                    'use_stack_ppa': True,
                     'parameter_list': [
                         JobParameter('hooks',
                                      'D09add_ppa~ppa_team~ppa_name'),
@@ -225,11 +265,13 @@
         self.assertEqual(expected, actual)
 
     def test_project_config_stack_ppa_with_false_hooks(self):
-        config = {'hooks': False}
+        config = {'hooks': False,
+                  'use_stack_ppa': True}
         job_data = {'stack_ppa': 'ppa_team/ppa_name'}
         expected = {'target_branch': 'lp:project',
                     'project_name': 'project',
                     'hooks': 'D09add_ppa~ppa_team~ppa_name',
+                    'use_stack_ppa': True,
                     'parameter_list': [
                         JobParameter('hooks',
                                      'D09add_ppa~ppa_team~ppa_name'),