Merge lp:~robru/unity8/pre_release_hook into lp:unity8

Proposed by Robert Bruce Park on 2016-03-19
Status: Merged
Approved by: Robert Bruce Park on 2016-04-14
Approved revision: 2293
Merged at revision: 2338
Proposed branch: lp:~robru/unity8/pre_release_hook
Merge into: lp:unity8
Diff against target: 25 lines (+5/-8)
2 files modified
debian/bileto_pre_release_hook (+5/-0)
debian/rules (+0/-8)
To merge this branch: bzr merge lp:~robru/unity8/pre_release_hook
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Needs Fixing on 2016-03-24
Michał Sawicz 2016-03-19 Needs Fixing on 2016-03-22
Robert Bruce Park (community) Approve on 2016-03-19
Review via email: mp+289550@code.launchpad.net

Commit Message

Use new bileto_pre_release_hook

To post a comment you must log in.
Robert Bruce Park (robru) wrote :

Ok, this change prepares unity8 for the new no-build-deps future, and is backwards compatible with the existing system.

Some points: The existing system runs the clean target inside the chroot long after the last commit was made, while the new system runs the pre_release_hook prior to committing the release hook. This means that the call to 'bzr commit' is indeed only needed in the clean target and not in the pre_release_hook. You can see an example release commit including unity8.pot updates here:

http://bazaar.launchpad.net/~untrusted-ci-dev-bot/unity8/unity8-ubuntu-xenial-landing-008/revision/2281

Steve asked me to decouple the no-build-deps work from the rest of the massive train refactorings I'm doing, which means this'll hit production much sooner than I previously anticipated. Please include this in your next unity8 silo!

review: Approve
lp:~robru/unity8/pre_release_hook updated on 2016-03-19
2286. By Robert Bruce Park on 2016-03-19

Only cd once.

2287. By Robert Bruce Park on 2016-03-19

fix rules.

lp:~robru/unity8/pre_release_hook updated on 2016-03-19
2288. By Robert Bruce Park on 2016-03-19

sh

2289. By Robert Bruce Park on 2016-03-19

Clean up diff.

2290. By Robert Bruce Park on 2016-03-19

Reduce redundancy.

Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2288
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/774/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/426
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial,testname=qmluitests.sh/426
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/426/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1015
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1031
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1031
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1029
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1029/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1029
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1029/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1029
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1029/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1029
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1029/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1029
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1029/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1029
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1029/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/774/rebuild

review: Needs Fixing (continuous-integration)
Robert Bruce Park (robru) wrote :

That failure looks transient if anybody wants to rerun it...

Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2290
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/775/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/427
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial,testname=qmluitests.sh/427
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/427/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1016
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1032
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1032
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1030
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1030/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1030
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1030/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1030
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1030/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1030
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1030/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1030
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1030/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1030
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1030/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/775/rebuild

review: Needs Fixing (continuous-integration)
Robert Bruce Park (robru) wrote :

Anyway that failure has nothing to do with this branch as far as I can tell.

Albert Astals Cid (aacid) wrote :

Yeah the autopilot failure has been happening for a while, don't worry about it.

lp:~robru/unity8/pre_release_hook updated on 2016-03-22
2291. By Robert Bruce Park on 2016-03-22

Revert update-unity-pot changes.

2292. By Robert Bruce Park on 2016-03-22

Whitespace fix.

2293. By Robert Bruce Park on 2016-03-22

Just drop override_dh_auto_clean.

Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2292
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/784/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1028
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1044
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1044
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1042
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1042/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1042
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1042/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1042
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1042/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1042
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1042/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1042
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1042/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1042
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1042/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/784/rebuild

review: Needs Fixing (continuous-integration)
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2293
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/786/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/436/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial,testname=qmluitests.sh/436/console
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=phone-armhf,release=vivid+overlay,testname=autopilot.sh/436
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1030
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1045
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1045
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1043
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1043/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1043
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1043/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1043
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1043/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1043
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1043/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1043
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1043/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1043
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1043/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/786/rebuild

review: Needs Fixing (continuous-integration)
Michał Sawicz (saviq) wrote :

This does not commit the translation template - it needs to happen for translations machinery to pick it up.

review: Needs Fixing
Robert Bruce Park (robru) wrote :

Train handles the commit for you now. See my comment here:

https://code.launchpad.net/~robru/unity8/pre_release_hook/+merge/289550/comments/740447

(uh, except this branch is no longer backwards compatible, I made it a clean break instead).

Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2293
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/847/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1092
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1101
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1101
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1099
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1099/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1099/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1099
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1099/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1099/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1099
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1099/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1099/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/847/rebuild

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'debian/bileto_pre_release_hook'
2--- debian/bileto_pre_release_hook 1970-01-01 00:00:00 +0000
3+++ debian/bileto_pre_release_hook 2016-03-22 05:07:47 +0000
4@@ -0,0 +1,5 @@
5+#!/bin/sh
6+
7+set -eux
8+
9+sh ./po/update-unity-pot
10
11=== modified file 'debian/rules'
12--- debian/rules 2016-01-05 11:24:07 +0000
13+++ debian/rules 2016-03-22 05:07:47 +0000
14@@ -36,11 +36,3 @@
15 # libMockLightDM-qml.so links against liblightdm-qt5-2.so which doesn't exist
16 override_dh_shlibdeps:
17 dh_shlibdeps -XlibMockLightDM-qml.so
18-
19-override_dh_auto_clean:
20- dh_auto_clean
21- # only run under "CI Train"
22- if [ -n "$(SILONAME)" -a -x /usr/bin/bzr ]; then \
23- ./po/update-unity-pot; \
24- bzr commit --message "Update translation template" po/unity8.pot; \
25- fi

Subscribers

People subscribed via source and target branches