Merge lp:~nskaggs/cupstream2distro-config/core-apps-clock-autolanding into lp:cupstream2distro-config

[Nicholas Skaggs]

Revert clock app to autoland on jenkins

Revert clock app to autoland on jenkins

[Francis Ginther (fginther)]

Approved.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1199
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/750/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-utopic-amd64-ci/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-utopic-i386-ci/61

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

review: Approve (continuous-integration)

=== modified file 'stacks/phablet/ubuntu-touch-coreapps-al.cfg'
--- stacks/phablet/ubuntu-touch-coreapps-al.cfg	2014-09-16 19:08:10 +0000
+++ stacks/phablet/ubuntu-touch-coreapps-al.cfg	2014-09-19 19:39:57 +0000
@@ -15,9 +15,3 @@
     build_timeout: 75
     publish: False
   projects:
-    ubuntu-clock-app:
-      hooks: B10pep8 B10pyflakes
-      standard_jobs: generic-click-autopilot-utopic-touch
-      test_suite: ubuntu_clock_app
-      autolanding:
-        postbuild_job: clock-app-click

=== modified file 'stacks/phablet/ubuntu-touch-coreapps.cfg'
--- stacks/phablet/ubuntu-touch-coreapps.cfg	2014-09-19 02:23:00 +0000
+++ stacks/phablet/ubuntu-touch-coreapps.cfg	2014-09-19 19:39:57 +0000
@@ -3,7 +3,7 @@
 #   following jenkins jobs on psoglav:
 #     - deploy-cupstream2distro-config (blacklist param)
 #     - trigger-ci-and-autolanding-job-NG (stack_blacklist param)
-#   You also need to update the trigger-ci-and-autolanding-job on 
+#   You also need to update the trigger-ci-and-autolanding-job on
 #   community jenkins.
 #
 #
@@ -49,7 +49,6 @@
       standard_jobs: generic-mediumtests-utopic-python3
       test_suite: calendar_app
     ubuntu-clock-app:
-      autolanding_template: False
       hooks: B10pep8 B10pyflakes
       standard_jobs: generic-mediumtests-utopic-python3
       test_suite: ubuntu_clock_app