Merge lp:~timo-jyrinki/ubuntu-ui-toolkit/xenial_temporary_tests_skip into lp:ubuntu-ui-toolkit/staging

Proposed by Timo Jyrinki
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 2090
Merged at revision: 2089
Proposed branch: lp:~timo-jyrinki/ubuntu-ui-toolkit/xenial_temporary_tests_skip
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 25 lines (+2/-2)
2 files modified
debian/rules (+1/-1)
debian/rules.gles (+1/-1)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu-ui-toolkit/xenial_temporary_tests_skip
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Zoltan Balogh Approve
Review via email: mp+305035@code.launchpad.net

Commit message

Temporarily skip unit tests on xenial while not all MPs to fix Qt 5.6 issues have landed yet.

To post a comment you must log in.
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Zoltan Balogh (bzoltan) :
review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-autolanding/495/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-land-mp/523/console

review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

(canceled previous CI runs because of missing gles)

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/rules'
--- debian/rules 2016-08-26 17:14:27 +0000
+++ debian/rules 2016-09-06 19:00:56 +0000
@@ -13,7 +13,7 @@
1313
14# Skip tests on the archs they are known to be flaky with current configuration14# Skip tests on the archs they are known to be flaky with current configuration
15testskip_architectures := powerpc arm64 ppc64el s390x15testskip_architectures := powerpc arm64 ppc64el s390x
16testskip_series := yakkety16testskip_series := yakkety xenial
1717
18override_dh_auto_configure:18override_dh_auto_configure:
19 qmake -r19 qmake -r
2020
=== modified file 'debian/rules.gles'
--- debian/rules.gles 2016-06-03 06:22:56 +0000
+++ debian/rules.gles 2016-09-06 19:00:56 +0000
@@ -9,7 +9,7 @@
9DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)9DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
10DEB_HOST_SERIES ?= $(shell lsb_release -c -s)10DEB_HOST_SERIES ?= $(shell lsb_release -c -s)
1111
12testskip_series := yakkety12testskip_series := yakkety xenial
1313
14CONFIGURE_SWITCHES = "-r" \14CONFIGURE_SWITCHES = "-r" \
15 "ROOT_SOURCE_DIR=$(CURDIR)" \15 "ROOT_SOURCE_DIR=$(CURDIR)" \

Subscribers

People subscribed via source and target branches