Merge lp:~sil2100/cupstream2distro-config/hook_cleanups into lp:cupstream2distro-config

[Łukasz Zemczak]

Remove many many unneeded PPA addition hooks in the head stacks

Remove many many unneeded PPA addition hooks in the head stacks

There's still webcred.cfg to check, but I need Ken for that!

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Francis Ginther (fginther)]

webapp.cfg needs a fix. The hook 'H05debian_rules_hack' should not be applied to:
webapps-applications
unity-firefox-extension
webapps-greasemonkey
unity-webapps-qml
cordova-ubuntu
cordova-ubuntu-tests

For these, please add 'hooks: False' to override the value in ci_default.

Otherwise, this is all good.

review: Needs Fixing

[lp:~sil2100/cupstream2distro-config/hook_cleanups]

742. By Łukasz Zemczak on 2013-09-03

Override the hooks: for some webapps components

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Francis Ginther (fginther)]

Thanks for the update, looks good.

review: Approve

=== modified file 'stacks/head/apps.cfg'
--- stacks/head/apps.cfg	2013-09-03 12:15:45 +0000
+++ stacks/head/apps.cfg	2013-09-03 16:55:22 +0000
@@ -39,7 +39,7 @@
     aggregate_tests: generic-mediumtests-saucy
     archive_artifacts: '**/*test*.xml'
     publish_junit: '**/*test*.xml'
-    hooks: D09add_ppa~phablet-team~ppa A10checklicenseheaders D09add_ppa~ubuntu-sdk-team~ppa
+    hooks: A10checklicenseheaders
   projects:
     gallery-app:
       configurations:
@@ -62,7 +62,7 @@
       aggregate_tests: saucy-amd64 generic-mediumtests-saucy
       archive_artifacts: '**/coverage.xml, **/*test*.xml'
       publish_coverage: '**/coverage.xml'
-      hooks: D09add_ppa~phablet-team~ppa A10checklicenseheaders D09add_ppa~ubuntu-sdk-team~ppa D10install_lcov H10enable_coverage B10gcovr_run
+      hooks: A10checklicenseheaders D10install_lcov H10enable_coverage B10gcovr_run
     webbrowser-app:
       test_suite: webbrowser_app
     notes-app:
 
=== modified file 'stacks/head/hud.cfg'
--- stacks/head/hud.cfg	2013-09-03 12:15:45 +0000
+++ stacks/head/hud.cfg	2013-09-03 16:55:22 +0000
@@ -34,7 +34,6 @@
       publish_coverage: '**/results/coverage.xml'
       publish_junit: '**/results/test*.xml'
     libhud-qt:
-      hooks: D09add_ppa~phablet-team~ppa
       ci:
         configurations:
           saucy-armhf:
 
=== modified file 'stacks/head/media.cfg'
--- stacks/head/media.cfg	2013-09-03 12:15:45 +0000
+++ stacks/head/media.cfg	2013-09-03 16:55:22 +0000
@@ -34,7 +34,7 @@
   projects:
     camera-app:
       contact_email: [e-mail]
-      hooks: D09add_ppa~phablet-team~ppa A10checklicenseheaders D09add_ppa~ubuntu-sdk-team~ppa
+      hooks: A10checklicenseheaders
       test_suite: camera_app
       configurations:
         generic-mediumtests-saucy:
@@ -46,7 +46,7 @@
       publish_junit: '**/*test*.xml'
     mediaplayer-app:
       contact_email: [e-mail]
-      hooks: D09add_ppa~phablet-team~ppa A10checklicenseheaders D09add_ppa~ubuntu-sdk-team~ppa
+      hooks: A10checklicenseheaders
       test_suite: mediaplayer_app
       configurations:
         generic-mediumtests-saucy:
@@ -58,19 +58,18 @@
       publish_junit: '**/*test*.xml'
     mediascanner:
     qtubuntu-camera:
-      hooks: D09add_ppa~phablet-team~ppa A10checklicenseheaders
+      hooks: A10checklicenseheaders
     qtubuntu-cameraplugin-fake:
-      hooks: D09add_ppa~mir-team~staging D09add_ppa~phablet-team~ppa A10checklicenseheaders
+      hooks: A10checklicenseheaders
     qtubuntu-media:
-      hooks: D09add_ppa~phablet-team~ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov
+      hooks: B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov
       configurations:
         saucy-armhf:
           archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
           publish_coverage: '**/coverage.xml'
     qtubuntu-media-signals:
-      hooks: D09add_ppa~phablet-team~ppa
     qtvideo-node:
-      hooks: D09add_ppa~phablet-team~ppa B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov
+      hooks: B09qmakecoverage B10gcovr_run H10enable_coverage D10install_lcov
       configurations:
         saucy-armhf:
           archive_artifacts: '**/output/*deb, **/results/*test*.xml, **/results/coverage.xml'
 
=== modified file 'stacks/head/mir.cfg'
--- stacks/head/mir.cfg	2013-09-03 12:15:45 +0000
+++ stacks/head/mir.cfg	2013-09-03 16:55:22 +0000
@@ -26,7 +26,7 @@
   projects:
     mir:
       contact_email: [e-mail] [e-mail]
-      hooks: H05set_package_version D00mbs_archive H10enable_coverage B10gcovr_run H15enable_testing D10install_valgrind B09copy_results D09add_ppa~phablet-team~ppa
+      hooks: H05set_package_version D00mbs_archive H10enable_coverage B10gcovr_run H15enable_testing D10install_valgrind B09copy_results
       archive_artifacts: '**/results/*test*.xml, **/results/coverage.xml, **/output/*deb'
       publish_coverage: '**/results/coverage.xml'
       publish_junit: '**/results/*test*.xml'
 
=== modified file 'stacks/head/mirslave.cfg'
--- stacks/head/mirslave.cfg	2013-09-03 12:15:45 +0000
+++ stacks/head/mirslave.cfg	2013-09-03 16:55:22 +0000
@@ -37,4 +37,4 @@
       force-rebuild: True # force rebuild as Mir is changing ABI everyday
       condition-force-rebuild: ../mir/mir.project* # rebuild everytime there is a Mir in the pipe
       contact_email: [e-mail] [e-mail]
-      hooks: H05set_package_version D00mbs_archive D09add_ppa~mir-team~staging
+      hooks: H05set_package_version D00mbs_archive
 
=== modified file 'stacks/head/phone.cfg'
--- stacks/head/phone.cfg	2013-08-30 09:11:25 +0000
+++ stacks/head/phone.cfg	2013-09-03 16:55:22 +0000
@@ -95,4 +95,4 @@
     telephony-service:
       autolanding: # indicator-messages is broken in archives
         landing_job: phablet-land # indicator-messages is broken in archives
-      hooks: D09add_ppa~phablet-team~ppa B09googletests B10gcovr_run H10enable_coverage D10install_lcov A10checklicenseheaders # indicator-messages is broken in archives
+      hooks: B09googletests B10gcovr_run H10enable_coverage D10install_lcov A10checklicenseheaders # indicator-messages is broken in archives
 
=== modified file 'stacks/head/platform.cfg'
--- stacks/head/platform.cfg	2013-09-03 12:15:45 +0000
+++ stacks/head/platform.cfg	2013-09-03 16:55:22 +0000
@@ -21,7 +21,6 @@
         node_label: pbuilder
       saucy-i386:
         node_label: pbuilder
-    hooks: D09add_ppa~phablet-team~ppa
     parallel_jobs: 2
     use_description_for_commit: False
   projects:
@@ -47,7 +46,7 @@
         saucy-i386: False
         saucy-amd64: False
     qtubuntu:
-      hooks: D09add_ppa~phablet-team~ppa A10checklicenseheaders
+      hooks: A10checklicenseheaders
       configurations:
         saucy-i386: False
         saucy-amd64: False
 
=== modified file 'stacks/head/webapp.cfg'
--- stacks/head/webapp.cfg	2013-08-30 04:09:55 +0000
+++ stacks/head/webapp.cfg	2013-09-03 16:55:22 +0000
@@ -22,11 +22,11 @@
       saucy-armhf:
         template: pbuilder-config.xml.tmpl
         node_label: calxeda-pbuilder
-    hooks: D09add_ppa~webapps~staging H05debian_rules_hack
+    hooks: H05debian_rules_hack
     hook_source: lp:~fginther/+junk/webapp-hooks
   projects:
     webapps-applications:
-      hooks: D09add_ppa~webapps~staging
+      hooks: False
     unity-webapps-amazon:
     unity-webapps-amazoncloudreader:
     unity-webapps-bbcnews:
@@ -63,29 +63,29 @@
     unity-webapps-yandexnews:
     unity-webapps-youtube:
     libunity-webapps:
-      hooks: B10gcovr_run D10install_lcov H10enable_coverage D09add_ppa~webapps~staging
+      hooks: B10gcovr_run D10install_lcov H10enable_coverage
       archive_artifacts: '**/coverage.xml'
       publish_coverage: '**/coverage.xml'
     unity-chromium-extension:
       daily_release: False # waiting for rvr to write some tests
-      hooks: B10gcovr_run D10install_lcov H10enable_coverage D09add_ppa~webapps~staging
+      hooks: B10gcovr_run D10install_lcov H10enable_coverage
       archive_artifacts: '**/*.xml'
       publish_coverage: '**/coverage.xml'
     unity-firefox-extension:
       daily_release: False # waiting for rvr to write some tests
-      hooks: D09add_ppa~webapps~staging
+      hooks: False
     webapps-greasemonkey:
       daily_release: False # waiting for rvr to write some tests
-      hooks: D09add_ppa~webapps~staging
+      hooks: False
     unity-webapps-qml:
-      hooks: D09add_ppa~webapps~staging
+      hooks: False
     cordova-ubuntu:
-      hooks: D08add_ppa-qt5-proper
+      hooks: False
       autolanding:
         distributions: raring,saucy
         ppa_target: ppa:ubuntu-sdk-team/ppa
     cordova-ubuntu-tests:
-      hooks: D08add_ppa-qt5-proper
+      hooks: False
       autolanding:
         distributions: raring,saucy
         ppa_target: ppa:ubuntu-sdk-team/ppa