Merge lp:~sil2100/cupstream2distro-config/add_ubuntu-ui-extras into lp:cupstream2distro-config

[Łukasz Zemczak]

Enable ubuntu-ui-extras for daily-release

Enable ubuntu-ui-extras for daily-release.

Merge only if this is merged in:
https://code.launchpad.net/~sil2100/ubuntu-ui-extras/packaging_review/+merge/181075

[Francis Ginther (fginther)]

There is a conflicting entry in another file that needs to be rmoved:
# grep -r ubuntu-ui-ex
stacks/no-dailies/sdk.cfg: ubuntu-ui-extras:

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~sil2100/cupstream2distro-config/add_ubuntu-ui-extras]

671. By Łukasz Zemczak on 2013-08-20

Remove the ubuntu-ui-extras from no-dailies

[Francis Ginther (fginther)]

Looks good!

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'stacks/head/sdk.cfg'
--- stacks/head/sdk.cfg	2013-08-20 15:30:16 +0000
+++ stacks/head/sdk.cfg	2013-08-20 16:06:23 +0000
@@ -55,6 +55,20 @@
      autolanding:
        ppa_target: ppa:ubuntu-touch-coreapps-drivers/daily
        distributions: precise,quantal,raring
+   ubuntu-ui-extras:
+      hooks: D09add_ppa~canonical-qt5-edgers~qt5-proper A10checklicenseheaders C09copy_results B09copy_results B10gcovr_run H10enable_coverage D10install_lcov
+      test_suite: ubuntu_ui_extras
+      archive_artifacts: '**/results/coverage.xml'
+      publish_coverage: '**/results/coverage.xml'
+      aggregate_tests: generic-mediumtests-saucy saucy-amd64
+      configurations:
+        saucy-armhf:
+          node_label: calxeda-pbuilder
+          archive_artifacts: '**/output/*deb'
+          publish_junit: False
+          publish_coverage: False
+        generic-mediumtests-saucy:
+          template: False
    ubuntu-ui-toolkit:
      hooks: D09add_ppa~canonical-qt5-edgers~qt5-proper A10checklicenseheaders C09copy_results B09copy_results B10gcovr_run H10enable_coverage D10install_lcov B10pep8 B10pyflakes
      test_suite: ubuntuuitoolkit

=== modified file 'stacks/no-dailies/sdk.cfg'
--- stacks/no-dailies/sdk.cfg	2013-08-01 13:03:44 +0000
+++ stacks/no-dailies/sdk.cfg	2013-08-20 16:06:23 +0000
@@ -14,22 +14,6 @@
         template: pbuilder-config.xml.tmpl
         node_label: calxeda-pbuilder
   projects:
-    ubuntu-ui-extras:
-      contact_email: [e-mail]
-      daily_release: False
-      hooks: D09add_ppa~canonical-qt5-edgers~qt5-proper A10checklicenseheaders C09copy_results B09copy_results B10gcovr_run H10enable_coverage D10install_lcov
-      test_suite: ubuntu_ui_extras
-      archive_artifacts: '**/results/coverage.xml'
-      publish_coverage: '**/results/coverage.xml'
-      aggregate_tests: generic-mediumtests-saucy saucy-amd64
-      configurations:
-        saucy-armhf:
-          node_label: calxeda-pbuilder
-          archive_artifacts: '**/output/*deb'
-          publish_junit: False
-          publish_coverage: False
-        generic-mediumtests-saucy:
-          template: False
     unity-action-api-nohud:
       daily_release: False
       target_branch: lp:~unity-team/unity-action-api/nohud