livecd-rootfs

Merge lp:~rbalint/livecd-rootfs/livecd-rootfs-autopkgtest into lp:livecd-rootfs

  1. livecd-rootfs-autopkgtest
  2. Merge into trunk
Proposed by Balint Reczey
Status: Merged
Merged at revision: 1464
Proposed branch: lp:~rbalint/livecd-rootfs/livecd-rootfs-autopkgtest
Merge into: lp:livecd-rootfs
Diff against target: 222 lines (+109/-9)
10 files modified
debian/tests/control (+3/-0)
debian/tests/default-bootstraps (+97/-0)
live-build/ubuntu-cpc/hooks/032-disk-image.binary (+2/-2)
live-build/ubuntu-cpc/hooks/032-root-squashfs.binary (+1/-1)
live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary (+1/-1)
live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary (+1/-1)
live-build/ubuntu-cpc/hooks/040-qcow2-image.binary (+1/-1)
live-build/ubuntu-cpc/hooks/040-vmdk-image.binary (+1/-1)
live-build/ubuntu-cpc/hooks/042-vagrant.binary (+1/-1)
live-build/ubuntu-cpc/hooks/999-extras.binary (+1/-1)
To merge this branch: bzr merge lp:~rbalint/livecd-rootfs/livecd-rootfs-autopkgtest
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+322322@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

All comments from previous MP at https://code.launchpad.net/~rbalint/livecd-rootfs/livecd-rootfs-autopkgtest/+merge/321459 have been addressed, this LGTM. Adding changelog entry, fixing two minor syntax things, and merging.

Can you raise MPs for each of the supported stable releases as well (trusty, xenial, yakkety)?

review: Approve
Revision history for this message
Balint Reczey (rbalint) wrote :

Sure, I'll raise the MPs after Zesty's release.

Revision history for this message
Balint Reczey (rbalint) wrote :

.. and after all tests pass: LP: #1684090

Revision history for this message
Balint Reczey (rbalint) wrote :

I have opened the MPs referencing LP: #1684090 and initiated the STU process.

Revision history for this message
Balint Reczey (rbalint) wrote :

SRU process :-)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'debian/tests'
2=== added file 'debian/tests/control'
3--- debian/tests/control 1970-01-01 00:00:00 +0000
4+++ debian/tests/control 2017-04-10 22:43:45 +0000
5@@ -0,0 +1,3 @@
6+Tests: default-bootstraps
7+Depends: @, lsb-release
8+Restrictions: needs-root
9
10=== added file 'debian/tests/default-bootstraps'
11--- debian/tests/default-bootstraps 1970-01-01 00:00:00 +0000
12+++ debian/tests/default-bootstraps 2017-04-10 22:43:45 +0000
13@@ -0,0 +1,97 @@
14+#!/bin/sh
15+# autopkgtest check: Build default rootfs for all supported project:subproject pairs
16+# (C) 2017 Canonical Ltd.
17+# Author: Balint Reczey <balint.reczey@canonical.com>
18+
19+set -e
20+
21+if [ -z "$SUITE"]; then
22+ SUITE=$(lsb_release -c -s)
23+fi
24+
25+# Known project:subproject:template combinations.
26+# Listed subprojects can be combined with other projects as well,
27+# but this list gives reasonable coverage.
28+ALL_TRIPLETS="
29+ base::
30+ edubuntu::
31+ edubuntu-dvd::
32+ kubuntu::
33+ kubuntu-active::
34+ kubuntu-dvd::
35+ kubuntu-plasma5::
36+ lubuntu::
37+ lubuntu-next::
38+ mythbuntu::
39+ ubuntu::
40+ ubuntu-base::
41+ ubuntu-budgie::
42+ ubuntu-budgie-desktop::
43+ ubuntu-budgie-live::
44+ ubuntu-core:system-image:ubuntu-core
45+ ubuntu-cpc::ubuntu-cpc
46+ ubuntu-desktop-next:system-image:ubuntu-desktop-next
47+ ubuntu-desktop-next::ubuntu-desktop-next
48+ ubuntu-dvd::
49+ ubuntu-gnome::
50+ ubuntukylin::
51+ ubuntu-mate::
52+ ubuntu-mate-core::
53+ ubuntu-mate-desktop::
54+ ubuntu-mate-live::
55+ ubuntu-netbook::
56+ ubuntu-server::
57+ ubuntu-server:ubuntu-rtm:
58+ ubuntu-server:ubuntu-rtm/foo:
59+ ubuntu-server:wubi:
60+ ubuntu-touch-custom::ubuntu-touch-custom
61+ ubuntu-touch::ubuntu-touch
62+ xubuntu::"
63+
64+if [ -z "$SELECTED_TRIPLETS" ]; then
65+ SELECTED_TRIPLETS="
66+ ubuntu-base::
67+ ubuntu-cpc::ubuntu-cpc
68+"
69+fi
70+
71+live_build_rootfs() {
72+ PROJECT=${1%%:*}
73+ local SUBPROJECT_TMP=${1%:*}
74+ SUBPROJECT=${SUBPROJECT_TMP#*:}
75+ TEMPLATE=${1##*:}
76+ ARCH=$(dpkg --print-architecture)
77+ echo "Building rootfs for project: '$PROJECT' subproject: '$SUBPROJECT' template: '$TEMPLATE' in $PWD"
78+ cp -a /usr/share/livecd-rootfs/live-build/auto .
79+ if [ -n "$TEMPLATE" ]; then
80+ cp -a /usr/share/livecd-rootfs/live-build/$TEMPLATE .
81+ fi
82+ (env PROJECT=$PROJECT \
83+ SUBPROJECT=$SUBPROJECT \
84+ SUITE=$SUITE \
85+ ARCH=$ARCH \
86+ lb config
87+ )
88+ mkdir chroot
89+ # this part needs root rights, but right now the whole script ran as root by autopkgtest
90+ (env PROJECT=$PROJECT \
91+ SUBPROJECT=$SUBPROJECT \
92+ ARCH=$ARCH \
93+ lb build
94+ )
95+ echo "Build results for project: '$PROJECT' subproject: '$SUBPROJECT' template: '$TEMPLATE' in $PWD"
96+ du -sh *
97+ echo ""
98+}
99+
100+WORKDIR=$(mktemp -d)
101+trap "RET=\$?; rm -rf $WORKDIR; exit \$RET" 0 INT QUIT ABRT PIPE TERM
102+cd $WORKDIR
103+
104+for i in $SELECTED_TRIPLETS; do
105+ mkdir $i
106+ (cd $i && live_build_rootfs $i)
107+ # clean up after build to avoid filling the disk, needs root rights
108+ rm -rf $i
109+done
110+
111
112=== modified file 'live-build/ubuntu-cpc/hooks/032-disk-image.binary'
113--- live-build/ubuntu-cpc/hooks/032-disk-image.binary 2016-06-09 09:47:25 +0000
114+++ live-build/ubuntu-cpc/hooks/032-disk-image.binary 2017-04-10 22:43:45 +0000
115@@ -1,6 +1,6 @@
116 #!/bin/bash -ex
117
118-. /build/config/functions
119+. config/functions
120
121 BOOTPART_START=
122 BOOTPART_END=
123@@ -92,7 +92,7 @@
124 # not the best place for this, but neither flash-kernel nor
125 # u-boot have provisions for installing u-boot via maintainer
126 # script
127- /build/config/hooks/raspi2/mkknlimg --dtok \
128+ config/hooks/raspi2/mkknlimg --dtok \
129 mountpoint/usr/lib/u-boot/rpi_2/u-boot.bin \
130 mountpoint/boot/firmware/uboot.bin
131 ;;
132
133=== modified file 'live-build/ubuntu-cpc/hooks/032-root-squashfs.binary'
134--- live-build/ubuntu-cpc/hooks/032-root-squashfs.binary 2017-02-08 23:18:22 +0000
135+++ live-build/ubuntu-cpc/hooks/032-root-squashfs.binary 2017-04-10 22:43:45 +0000
136@@ -17,7 +17,7 @@
137 exit 0
138 fi
139
140-. /build/config/functions
141+. config/functions
142
143 mkdir binary/boot/squashfs.dir
144 cp -a chroot/* binary/boot/squashfs.dir
145
146=== modified file 'live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary'
147--- live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary 2017-02-17 22:30:31 +0000
148+++ live-build/ubuntu-cpc/hooks/033-disk-image-uefi.binary 2017-04-10 22:43:45 +0000
149@@ -9,7 +9,7 @@
150 ;;
151 esac
152
153-. /build/config/functions
154+. config/functions
155
156 apt-get -qqy install dosfstools gdisk
157
158
159=== modified file 'live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary'
160--- live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary 2016-09-02 11:54:19 +0000
161+++ live-build/ubuntu-cpc/hooks/034-disk-image-ppc64el.binary 2017-04-10 22:43:45 +0000
162@@ -7,7 +7,7 @@
163 ;;
164 esac
165
166-. /build/config/functions
167+. config/functions
168
169 create_partitions() {
170 disk_image="$1"
171
172=== modified file 'live-build/ubuntu-cpc/hooks/040-qcow2-image.binary'
173--- live-build/ubuntu-cpc/hooks/040-qcow2-image.binary 2017-02-07 18:19:03 +0000
174+++ live-build/ubuntu-cpc/hooks/040-qcow2-image.binary 2017-04-10 22:43:45 +0000
175@@ -21,7 +21,7 @@
176
177 apt-get install -qqy qemu-utils
178
179-. /build/config/functions
180+. config/functions
181
182 if [ -f binary/boot/disk-uefi.ext4 ]; then
183 convert_to_qcow2 binary/boot/disk-uefi.ext4 livecd.ubuntu-cpc.img
184
185=== modified file 'live-build/ubuntu-cpc/hooks/040-vmdk-image.binary'
186--- live-build/ubuntu-cpc/hooks/040-vmdk-image.binary 2017-02-07 18:19:03 +0000
187+++ live-build/ubuntu-cpc/hooks/040-vmdk-image.binary 2017-04-10 22:43:45 +0000
188@@ -18,7 +18,7 @@
189 ;;
190 esac
191
192-. /build/config/functions
193+. config/functions
194
195 if [ -e binary/boot/disk-uefi.ext4 ]; then
196 create_vmdk binary/boot/disk-uefi.ext4 livecd.ubuntu-cpc.vmdk
197
198=== modified file 'live-build/ubuntu-cpc/hooks/042-vagrant.binary'
199--- live-build/ubuntu-cpc/hooks/042-vagrant.binary 2017-02-28 06:34:19 +0000
200+++ live-build/ubuntu-cpc/hooks/042-vagrant.binary 2017-04-10 22:43:45 +0000
201@@ -44,7 +44,7 @@
202 exit 0;;
203 esac
204
205-. /build/config/functions
206+. config/functions
207
208 # Virtualbox is needed for making a small VMDK
209 apt-get -qqy install genisoimage qemu-utils
210
211=== modified file 'live-build/ubuntu-cpc/hooks/999-extras.binary'
212--- live-build/ubuntu-cpc/hooks/999-extras.binary 2016-01-28 10:07:33 +0000
213+++ live-build/ubuntu-cpc/hooks/999-extras.binary 2017-04-10 22:43:45 +0000
214@@ -9,7 +9,7 @@
215 fi
216
217 # Export the common functions to the extras
218-. /build/config/functions
219+. config/functions
220
221 # Cleaner execution
222 /bin/run-parts --regex ".*\.binary" "${extra_d}"

Subscribers

People subscribed via source and target branches