Merge lp://qastaging/~renatofilho/address-book-app/skip-s390-build into lp://qastaging/address-book-app

Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 621
Merged at revision: 621
Proposed branch: lp://qastaging/~renatofilho/address-book-app/skip-s390-build
Merge into: lp://qastaging/address-book-app
Diff against target: 72 lines (+15/-15)
2 files modified
debian/control (+14/-14)
debian/control.in (+1/-1)
To merge this branch: bzr merge lp://qastaging/~renatofilho/address-book-app/skip-s390-build
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
system-apps-ci-bot continuous-integration Needs Fixing
Review via email: mp+303574@code.qastaging.launchpad.net

Commit message

Avoid building the package for s390x arch by introducing a s390x qtdeclarative5-ubuntu-content1 build-dependency.

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

PASSED: Continuous integration, rev:620
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/20/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1262
    SUCCESS: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/275
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1262
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1131
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1131
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1131
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1118
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1118/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1118
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1118/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1118
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1118/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1118
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1118/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1118
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1118/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1118
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1118/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1118
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1118/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1118
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1118/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1118
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1118/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/20/rebuild

review: Approve (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:621
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/21/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build/1263
    FAILURE: https://jenkins.canonical.com/system-apps/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=default/276/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1263
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=vivid+overlay/1132
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=xenial+overlay/1132
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-1-sourcepkg/release=yakkety/1132
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1119
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1119/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1119
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1119/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1119
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1119/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1119
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1119/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1119
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1119/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1119
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1119/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1119
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1119/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1119
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1119/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1119
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1119/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-address-book-app-ci/21/rebuild

review: Needs Fixing (continuous-integration)
620. By Renato Araujo Oliveira Filho

Avoid build pakcage for s390 arch.

Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Ok, a quick question first: are you sure you want to just add the s390x arch-dependency for this one package? It's not that it's bad, just not really a clean solution I must say. The best would be to add s390x to ARCHS in the bileto hook. Yes, this would add it to all places where ARCHS is used, but IIUC it will still dep-wait on s390x because this one package is not available. The pro of this approach is that we don't introduce fragmentation and all ARCH data will be currently in one place (in the bileto hook).

But that being said, it's just a matter how you prefer it really.

Just a small nitpick: if you prefer to stay with the solution as is now, could you also do the same small modification in debian/control? debian/control is auto-generated, but I prefer it to always have 'sane' contents (in-sync with control.in) in case someone does a quick check of debian/control before running the hook (or autoclean).

review: Needs Information
621. By Renato Araujo Oliveira Filho

Autogenerate a new version of debian/control.

Revision history for this message
Renato Araujo Oliveira Filho (renatofilho) wrote :

> Ok, a quick question first: are you sure you want to just add the s390x arch-
> dependency for this one package? It's not that it's bad, just not really a
> clean solution I must say. The best would be to add s390x to ARCHS in the
> bileto hook. Yes, this would add it to all places where ARCHS is used, but
> IIUC it will still dep-wait on s390x because this one package is not
> available. The pro of this approach is that we don't introduce fragmentation
> and all ARCH data will be currently in one place (in the bileto hook).
>
> But that being said, it's just a matter how you prefer it really.
>
> Just a small nitpick: if you prefer to stay with the solution as is now, could
> you also do the same small modification in debian/control? debian/control is
> auto-generated, but I prefer it to always have 'sane' contents (in-sync with
> control.in) in case someone does a quick check of debian/control before
> running the hook (or autoclean).

I prefer to use this approach because this is the only package missing on s390. (this is the package that is causing the build to keep waiting for deps).

Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Ok, in that case let's go with this. Before building the package modify the commit message to be more verbose, something like: "Avoid building the package for s390x arch by introducing a s390x qtdeclarative5-ubuntu-content1 build-dependency" or similar.

But besides that - approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches