Merge lp:~vorlon/ubuntu-cdimage/prune-obsolete-code into lp:ubuntu-cdimage
- prune-obsolete-code
- Merge into mainline
Proposed by
Steve Langasek
| Status: | Merged |
|---|---|
| Approved by: | Łukasz Zemczak |
| Approved revision: | 1802 |
| Merged at revision: | 1791 |
| Proposed branch: | lp:~vorlon/ubuntu-cdimage/prune-obsolete-code |
| Merge into: | lp:ubuntu-cdimage |
| Diff against target: |
4813 lines (+594/-1579) 24 files modified
bin/cron.daily (+1/-1) bin/cron.dvd (+1/-16) bin/daily-checks (+0/-14) bin/find-live-filesystem (+1/-1) bin/make-metalink (+1/-1) bin/rebuild-requests (+1/-2) etc/config (+0/-5) etc/default-arches (+21/-89) etc/livefs-launchpad (+3/-8) etc/purge-days (+0/-5) etc/qa-products (+0/-11) lib/cdimage/build.py (+27/-93) lib/cdimage/germinate.py (+59/-204) lib/cdimage/livefs.py (+27/-162) lib/cdimage/project.py (+0/-10) lib/cdimage/tests/test_build.py (+93/-133) lib/cdimage/tests/test_build_id.py (+2/-2) lib/cdimage/tests/test_check_installable.py (+8/-8) lib/cdimage/tests/test_config.py (+0/-6) lib/cdimage/tests/test_germinate.py (+71/-201) lib/cdimage/tests/test_livefs.py (+80/-198) lib/cdimage/tests/test_mirror.py (+0/-4) lib/cdimage/tests/test_tree.py (+145/-205) lib/cdimage/tree.py (+53/-200) |
| To merge this branch: | bzr merge lp:~vorlon/ubuntu-cdimage/prune-obsolete-code |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Łukasz Zemczak | Approve | ||
|
Review via email:
|
|||
Commit message
Prune information about obsolete releases.
The code has never dropped support for any historic Ubuntu releases. After
30+ releases, this makes the code quite cumbersome, and we know we will
never be re-releasing images for any releases that have reached end-of-life.
Instead of leaving hard-to-read code everywhere, trim all references to
releases that have reached end of life; if someone needs the old stuff, they
can always consult the VCS history for reference.
As of today, supported releases means:
- precise (still ESM supported)
- trusty
- xenial
- bionic
- cosmic
- disco
older releases, and interim non-LTS releases, are dropped.
Description of the change
There is still more code cleanup that could be done here to drop obsolete projects (jeos!), but this is IMHO a reasonable first pass.
To post a comment you must log in.
- 1800. By Steve Langasek
-
drop kubuntu-plasma5, which was utopic/vivid only
- 1801. By Steve Langasek
-
Drop jeos support, obsolete since intrepid
- 1802. By Steve Langasek
-
Drop moblin-remix, which stopped being built some time before 12.04
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'bin/cron.daily' |
| 2 | --- bin/cron.daily 2015-10-26 11:06:11 +0000 |
| 3 | +++ bin/cron.daily 2019-02-28 22:59:07 +0000 |
| 4 | @@ -39,7 +39,7 @@ |
| 5 | series = config["DIST"] |
| 6 | if project == "edubuntu": |
| 7 | config["CDIMAGE_ADDON"] = "1" |
| 8 | - elif (project == "ubuntu-server" and series >= "quantal" and |
| 9 | + elif (project == "ubuntu-server" and series >= "trusty" and |
| 10 | not config["CDIMAGE_NO_SQUASHFS_BASE"]): |
| 11 | config["CDIMAGE_SQUASHFS_BASE"] = "1" |
| 12 | if not build_image_set(config, options): |
| 13 | |
| 14 | === modified file 'bin/cron.dvd' |
| 15 | --- bin/cron.dvd 2015-10-26 11:06:11 +0000 |
| 16 | +++ bin/cron.dvd 2019-02-28 22:59:07 +0000 |
| 17 | @@ -35,22 +35,7 @@ |
| 18 | options, _ = parser.parse_args() |
| 19 | config = Config(IMAGE_TYPE="dvd") |
| 20 | project = config.project |
| 21 | - series = config["DIST"] |
| 22 | - if project == "edubuntu": |
| 23 | - # Edubuntu lucid and onwards: DVD is live-only |
| 24 | - if series <= "karmic": |
| 25 | - config["CDIMAGE_INSTALL"] = "1" |
| 26 | - elif project == "ubuntu": |
| 27 | - # Ubuntu oneiric and onwards: DVD is live-only |
| 28 | - if series <= "natty": |
| 29 | - config["CDIMAGE_INSTALL"] = "1" |
| 30 | - elif project == "ubuntustudio": |
| 31 | - # Ubuntu Studio precise and onwards: DVD is live-only |
| 32 | - # (Actually, it didn't exist before then anyway, but we check this |
| 33 | - # just for documentation's sake.) |
| 34 | - if series <= "oneiric": |
| 35 | - config["CDIMAGE_INSTALL"] = "1" |
| 36 | - else: |
| 37 | + if project not in ("edubuntu", "ubuntu", "ubuntustudio"): |
| 38 | config["CDIMAGE_INSTALL"] = "1" |
| 39 | config["CDIMAGE_LIVE"] = "1" |
| 40 | config["CDIMAGE_DVD"] = "1" |
| 41 | |
| 42 | === modified file 'bin/daily-checks' |
| 43 | --- bin/daily-checks 2018-12-18 19:27:24 +0000 |
| 44 | +++ bin/daily-checks 2019-02-28 22:59:07 +0000 |
| 45 | @@ -83,20 +83,10 @@ |
| 46 | def project_title(project): |
| 47 | if project == 'ubuntu-server': |
| 48 | return 'Ubuntu Server' |
| 49 | - elif project == 'jeos': |
| 50 | - return 'Ubuntu JeOS' |
| 51 | elif project == 'ubuntustudio': |
| 52 | return 'Ubuntu Studio' |
| 53 | - elif project == 'ubuntu-netbook': |
| 54 | - return 'Ubuntu Netbook' |
| 55 | - elif project == 'ubuntu-headless': |
| 56 | - return 'Ubuntu Headless' |
| 57 | elif project == 'kubuntu-active': |
| 58 | return 'Kubuntu Active' |
| 59 | - elif project == 'kubuntu-plasma5': |
| 60 | - return 'Kubuntu Plasma 5' |
| 61 | - elif project == 'ubuntu-moblin-remix': |
| 62 | - return 'Ubuntu Moblin Remix' |
| 63 | else: |
| 64 | return project.title() |
| 65 | |
| 66 | @@ -237,17 +227,13 @@ |
| 67 | |
| 68 | projects = ( |
| 69 | 'ubuntu', |
| 70 | - 'ubuntu-desktop-next', |
| 71 | 'ubuntu-server', |
| 72 | 'kubuntu', |
| 73 | 'edubuntu', |
| 74 | 'xubuntu', |
| 75 | 'ubuntustudio', |
| 76 | - 'ubuntu-netbook', |
| 77 | 'kubuntu-netbook', |
| 78 | - 'ubuntu-moblin-remix', |
| 79 | 'kubuntu-active', |
| 80 | - 'kubuntu-plasma5', |
| 81 | 'mythbuntu', |
| 82 | 'lubuntu', |
| 83 | 'lubuntu-next', |
| 84 | |
| 85 | === modified file 'bin/find-live-filesystem' |
| 86 | --- bin/find-live-filesystem 2018-02-23 13:03:40 +0000 |
| 87 | +++ bin/find-live-filesystem 2019-02-28 22:59:07 +0000 |
| 88 | @@ -33,7 +33,7 @@ |
| 89 | parser = OptionParser( |
| 90 | "%prog ARCH cloop|squashfs|kernel|kernel-efi-signed|initrd|bootimg|" |
| 91 | "manifest|manifest-desktop|manifest-remove|manifest-minimal-remove|" |
| 92 | - "disk1.img.xz|img.xz|size|winfoss|wubi|umenu|usb-creator|" |
| 93 | + "disk1.img.xz|img.xz|size|wubi|usb-creator|" |
| 94 | "ltsp-squashfs|ext2|ext3|ext4|rootfs.tar.gz|custom.tar.gz|" |
| 95 | "device.tar.gz|tar.xz|iso") |
| 96 | _, args = parser.parse_args() |
| 97 | |
| 98 | === modified file 'bin/make-metalink' |
| 99 | --- bin/make-metalink 2015-10-26 11:06:11 +0000 |
| 100 | +++ bin/make-metalink 2019-02-28 22:59:07 +0000 |
| 101 | @@ -32,7 +32,7 @@ |
| 102 | parser = OptionParser( |
| 103 | "%prog DIRECTORY VERSION STATUS\n" |
| 104 | " e.g.: %prog " + config.root + |
| 105 | - "/www/full/daily-live/20130327 raring daily") |
| 106 | + "/www/full/daily-live/20130327 bionic daily") |
| 107 | _, args = parser.parse_args() |
| 108 | if len(args) < 1: |
| 109 | parser.error("need directory") |
| 110 | |
| 111 | === modified file 'bin/rebuild-requests' |
| 112 | --- bin/rebuild-requests 2018-10-30 13:23:58 +0000 |
| 113 | +++ bin/rebuild-requests 2019-02-28 22:59:07 +0000 |
| 114 | @@ -134,8 +134,7 @@ |
| 115 | env['SUBPROJECT'] = sub_project |
| 116 | |
| 117 | if (project == "ubuntu-touch" and |
| 118 | - args[0] in ("vivid", "wily", "xenial", "yakkety", "zesty", |
| 119 | - "artful", "bionic", "cosmic", "disco")): |
| 120 | + args[0] in ("xenial", "bionic", "cosmic", "disco")): |
| 121 | env['EXTRA_PPAS'] = \ |
| 122 | "ci-train-ppa-service/stable-phone-overlay:1001" |
| 123 | env['PROPOSED'] = "0" |
| 124 | |
| 125 | === modified file 'etc/config' |
| 126 | --- etc/config 2019-02-22 07:28:47 +0000 |
| 127 | +++ etc/config 2019-02-28 22:59:07 +0000 |
| 128 | @@ -15,11 +15,6 @@ |
| 129 | PROJECT="${PROJECT:-ubuntu}" |
| 130 | CAPPROJECT="${CAPPROJECT:-Ubuntu}" |
| 131 | IMAGE_FORMAT=${IMAGE_FORMAT:-iso} |
| 132 | -case $PROJECT in |
| 133 | - ubuntu-mid) |
| 134 | - IMAGE_FORMAT=${IMAGE_FORMAT:-vfat} |
| 135 | - ;; |
| 136 | -esac |
| 137 | export IMAGE_FORMAT |
| 138 | DIST="${DIST:-disco}" |
| 139 | |
| 140 | |
| 141 | === modified file 'etc/default-arches' |
| 142 | --- etc/default-arches 2019-02-07 15:42:49 +0000 |
| 143 | +++ etc/default-arches 2019-02-28 22:59:07 +0000 |
| 144 | @@ -3,69 +3,35 @@ |
| 145 | |
| 146 | * source * i386 |
| 147 | |
| 148 | -ubuntu-touch daily-preinstalled saucy armhf |
| 149 | -ubuntu-touch daily-preinstalled trusty-wily armhf i386 |
| 150 | +ubuntu-touch daily-preinstalled trusty armhf i386 |
| 151 | ubuntu-touch daily-preinstalled xenial- armhf i386 arm64 |
| 152 | -ubuntu-touch daily-preinstalled ubuntu-rtm/* armhf i386 |
| 153 | - |
| 154 | -ubuntu-touch-custom daily-preinstalled trusty- armhf i386 |
| 155 | - |
| 156 | -ubuntu daily-preinstalled oneiric armel+ac100 armel+mx5 armel+omap armel+omap4 |
| 157 | -ubuntu daily-preinstalled raring armhf+nexus7 |
| 158 | -lubuntu daily-preinstalled quantal-saucy armhf+ac100 |
| 159 | - |
| 160 | -* daily-preinstalled maverick-oneiric armel+omap armel+omap4 |
| 161 | -ubuntu-server daily-preinstalled quantal armhf+omap4 |
| 162 | - |
| 163 | -edubuntu dvd quantal- amd64 i386 |
| 164 | -edubuntu-dvd dvd quantal- amd64 i386 |
| 165 | - |
| 166 | -ubuntu-base daily oneiric amd64 armel i386 |
| 167 | + |
| 168 | +edubuntu dvd trusty- amd64 i386 |
| 169 | +edubuntu-dvd dvd trusty- amd64 i386 |
| 170 | + |
| 171 | ubuntu-base daily precise amd64 armhf i386 |
| 172 | -ubuntu-base daily quantal-raring amd64 armhf i386 powerpc |
| 173 | -ubuntu-base daily saucy amd64 arm64 armhf i386 powerpc |
| 174 | -ubuntu-base daily trusty-wily amd64 arm64 armhf i386 powerpc ppc64el |
| 175 | -ubuntu-base daily xenial-yakkety amd64 arm64 armhf i386 powerpc ppc64el s390x |
| 176 | -ubuntu-base daily zesty- amd64 arm64 armhf i386 ppc64el s390x |
| 177 | -ubuntu-core-system-image daily-preinstalled utopic amd64 armhf i386 |
| 178 | -ubuntu-core-system-image daily-preinstalled vivid-wily amd64 arm64 armhf i386 |
| 179 | +ubuntu-base daily trusty amd64 arm64 armhf i386 powerpc ppc64el |
| 180 | +ubuntu-base daily xenial amd64 arm64 armhf i386 powerpc ppc64el s390x |
| 181 | +ubuntu-base daily bionic- amd64 arm64 armhf i386 ppc64el s390x |
| 182 | ubuntu-core-system-image daily-preinstalled xenial- amd64 arm64 armhf i386 ppc64el s390x |
| 183 | ubuntu-core daily-live xenial-cosmic amd64 arm64+snapdragon armhf+cm3 armhf+raspi2 armhf+raspi3 i386 |
| 184 | ubuntu-core daily-live disco- amd64 arm64+snapdragon armhf+cm3 armhf+raspi2 armhf+raspi3 arm64+raspi3 i386 |
| 185 | |
| 186 | -jeos * * i386 |
| 187 | - |
| 188 | -kubuntu daily-live feisty-intrepid amd64 i386 ia64 powerpc |
| 189 | -kubuntu daily-live jaunty amd64 armel i386 ia64 powerpc |
| 190 | -kubuntu daily-live karmic amd64 armel+dove armel+imx51 i386 ia64 powerpc |
| 191 | -kubuntu daily-live lucid amd64 i386 ia64 powerpc |
| 192 | kubuntu daily-live precise amd64 i386 |
| 193 | kubuntu daily-live trusty amd64 amd64+mac i386 |
| 194 | -kubuntu daily-live utopic-bionic amd64 i386 |
| 195 | +kubuntu daily-live xenial-bionic amd64 i386 |
| 196 | kubuntu daily-live cosmic- amd64 |
| 197 | |
| 198 | kubuntu-active * * i386 |
| 199 | |
| 200 | -kubuntu-plasma5 daily-live utopic- amd64 i386 |
| 201 | - |
| 202 | -mythbuntu * warty-edgy amd64 i386 powerpc |
| 203 | mythbuntu * * amd64 i386 |
| 204 | |
| 205 | -ubuntu daily karmic amd64 armel+dove armel+imx51 i386 ia64 lpia powerpc powerpc+ps3 sparc |
| 206 | ubuntu daily precise amd64 amd64+mac i386 |
| 207 | |
| 208 | -ubuntu daily-live feisty-intrepid amd64 i386 ia64 powerpc powerpc+ps3 |
| 209 | -ubuntu daily-live jaunty amd64 armel i386 ia64 powerpc powerpc+ps3 |
| 210 | -ubuntu daily-live karmic amd64 armel+dove armel+imx51 i386 ia64 powerpc powerpc+ps3 |
| 211 | -ubuntu daily-live lucid amd64 i386 ia64 powerpc powerpc+ps3 |
| 212 | ubuntu daily-live precise amd64 amd64+mac i386 |
| 213 | -ubuntu daily-live quantal amd64 amd64+mac armhf+omap4 i386 powerpc |
| 214 | -ubuntu daily-live raring-trusty amd64 amd64+mac i386 |
| 215 | -ubuntu daily-live utopic-zesty amd64 i386 |
| 216 | -ubuntu daily-live artful- amd64 |
| 217 | - |
| 218 | -ubuntu-desktop-next * -vivid amd64 i386 armhf |
| 219 | -ubuntu-desktop-next-system-image daily-preinstalled wily- amd64 i386 armhf |
| 220 | +ubuntu daily-live trusty amd64 amd64+mac i386 |
| 221 | +ubuntu daily-live xenial amd64 i386 |
| 222 | +ubuntu daily-live bionic- amd64 |
| 223 | |
| 224 | ubuntu-gnome * * amd64 i386 |
| 225 | |
| 226 | @@ -75,65 +41,31 @@ |
| 227 | ubuntu-mate * -bionic amd64 i386 |
| 228 | ubuntu-mate * cosmic- amd64 |
| 229 | |
| 230 | -ubuntu-mid * * lpia |
| 231 | - |
| 232 | -ubuntu-moblin-remix * * i386 |
| 233 | - |
| 234 | -ubuntu-netbook daily-live lucid armel+imx51 armel+dove armel+omap i386 |
| 235 | -ubuntu-netbook daily-live maverick armel+dove i386 |
| 236 | - |
| 237 | -ubuntu-server daily-preinstalled xenial-artful armhf+raspi2 |
| 238 | +ubuntu-server daily-preinstalled xenial armhf+raspi2 |
| 239 | ubuntu-server daily-preinstalled bionic- armhf+raspi2 armhf+raspi3 arm64+raspi3 |
| 240 | -ubuntu-server * intrepid amd64 hppa i386 ia64 powerpc powerpc+ps3 sparc |
| 241 | -ubuntu-server * jaunty amd64 armel hppa i386 ia64 powerpc powerpc+ps3 sparc |
| 242 | -ubuntu-server * karmic-lucid amd64 armel+dove armel+imx51 armel+omap i386 ia64 powerpc powerpc+ps3 sparc |
| 243 | -ubuntu-server * maverick amd64 amd64+mac armel+dove armel+omap armel+omap4 i386 powerpc powerpc+ps3 |
| 244 | -ubuntu-server * natty-oneiric amd64 amd64+mac armel+dove armel+omap armel+omap4 i386 powerpc |
| 245 | ubuntu-server * precise amd64 i386 |
| 246 | -ubuntu-server * quantal-saucy amd64 amd64+mac armhf+omap armhf+omap4 i386 powerpc |
| 247 | ubuntu-server * trusty amd64 amd64+mac i386 powerpc ppc64el |
| 248 | -ubuntu-server * utopic-wily amd64 i386 powerpc ppc64el |
| 249 | -ubuntu-server * xenial-yakkety amd64 arm64 i386 powerpc ppc64el s390x |
| 250 | -ubuntu-server * zesty-artful amd64 arm64 i386 ppc64el s390x |
| 251 | +ubuntu-server * xenial amd64 arm64 i386 powerpc ppc64el s390x |
| 252 | ubuntu-server * bionic- amd64 arm64 ppc64el s390x |
| 253 | |
| 254 | -ubuntu-server-live * artful-cosmic amd64 arm64 ppc64el |
| 255 | +ubuntu-server-live * bionic-cosmic amd64 arm64 ppc64el |
| 256 | ubuntu-server-live * disco- amd64 arm64 ppc64el s390x |
| 257 | |
| 258 | ubuntu-wubi * * amd64 i386 |
| 259 | |
| 260 | -ubuntu-zh_CN * maverick-natty i386 |
| 261 | -ubuntu-zh_CN * oneiric- amd64 i386 |
| 262 | +ubuntu-zh_CN * precise- amd64 i386 |
| 263 | ubuntukylin * -bionic amd64 i386 |
| 264 | ubuntukylin * cosmic- amd64 |
| 265 | |
| 266 | -ubuntustudio * warty-edgy amd64 i386 powerpc |
| 267 | -ubuntustudio * feisty-bionic amd64 i386 |
| 268 | +ubuntustudio * precise-bionic amd64 i386 |
| 269 | ubuntustudio * cosmic- amd64 |
| 270 | |
| 271 | -xubuntu daily-live jaunty armel powerpc powerpc+ps3 |
| 272 | -xubuntu daily-live karmic armel+dove armel+imx51 powerpc powerpc+ps3 |
| 273 | - |
| 274 | -xubuntu * feisty-maverick amd64 i386 powerpc powerpc+ps3 |
| 275 | -xubuntu * natty-cosmic amd64 i386 |
| 276 | +xubuntu * precise-cosmic amd64 i386 |
| 277 | xubuntu * disco- amd64 |
| 278 | |
| 279 | -* daily-live gutsy-intrepid amd64 i386 ia64 powerpc powerpc+ps3 sparc |
| 280 | -* daily-live jaunty amd64 armel i386 ia64 powerpc powerpc+ps3 sparc |
| 281 | -* daily-live karmic amd64 i386 ia64 powerpc powerpc+ps3 sparc |
| 282 | - |
| 283 | -* dvd warty-edgy amd64 i386 powerpc |
| 284 | -* dvd feisty-cosmic amd64 i386 |
| 285 | +* dvd precise-cosmic amd64 i386 |
| 286 | * dvd * amd64 |
| 287 | |
| 288 | -* * warty-dapper amd64 hppa i386 ia64 powerpc sparc |
| 289 | -* * edgy amd64 i386 ia64 powerpc sparc |
| 290 | -* * feisty amd64 i386 ia64 powerpc powerpc+ps3 sparc |
| 291 | -* * gutsy-hardy amd64 hppa i386 ia64 powerpc powerpc+ps3 sparc |
| 292 | -* * intrepid-jaunty amd64 hppa i386 ia64 lpia powerpc powerpc+ps3 sparc |
| 293 | -* * karmic amd64 i386 ia64 lpia powerpc powerpc+ps3 sparc |
| 294 | -* * lucid amd64 i386 ia64 powerpc powerpc+ps3 sparc |
| 295 | -* * maverick amd64 amd64+mac i386 powerpc powerpc+ps3 |
| 296 | -* * natty-trusty amd64 amd64+mac i386 powerpc |
| 297 | -* * utopic-cosmic amd64 i386 |
| 298 | +* * precise-trusty amd64 amd64+mac i386 powerpc |
| 299 | +* * xenial-cosmic amd64 i386 |
| 300 | * * * amd64 |
| 301 | |
| 302 | === modified file 'etc/livefs-launchpad' |
| 303 | --- etc/livefs-launchpad 2017-05-16 16:10:49 +0000 |
| 304 | +++ etc/livefs-launchpad 2019-02-28 22:59:07 +0000 |
| 305 | @@ -3,15 +3,12 @@ |
| 306 | # Like etc/default-arches, "PROJECT" is in fact PROJECT[-SUBPROJECT][-LOCALE]. |
| 307 | |
| 308 | ubuntu daily-live * * ubuntu-cdimage/ubuntu |
| 309 | -ubuntu-desktop-next daily-live -vivid * ubuntu-cdimage/ubuntu-desktop-next |
| 310 | -ubuntu-desktop-next-system-image daily-preinstalled wily- * ubuntu-cdimage/ubuntu-desktop-next |
| 311 | kubuntu daily-live * * ubuntu-cdimage/kubuntu |
| 312 | -kubuntu-plasma5 daily-live * * ubuntu-cdimage/kubuntu-plasma5 |
| 313 | edubuntu dvd * * ubuntu-cdimage/edubuntu |
| 314 | xubuntu daily-live * * ubuntu-cdimage/xubuntu |
| 315 | -ubuntu-server daily quantal- * ubuntu-cdimage/ubuntu-server |
| 316 | +ubuntu-server daily trusty- * ubuntu-cdimage/ubuntu-server |
| 317 | ubuntu-server daily-preinstalled xenial- * ubuntu-cdimage/cpc |
| 318 | -ubuntu-server-live daily-live zesty- * ubuntu-cdimage/ubuntu-server-live |
| 319 | +ubuntu-server-live daily-live bionic- * ubuntu-cdimage/ubuntu-server-live |
| 320 | ubuntustudio dvd * * ubuntu-cdimage/ubuntustudio |
| 321 | mythbuntu daily-live * * ubuntu-cdimage/mythbuntu |
| 322 | lubuntu-next daily-live * * ubuntu-cdimage/lubuntu-next |
| 323 | @@ -27,8 +24,6 @@ |
| 324 | ubuntu-budgie daily-live * * ubuntu-cdimage/ubuntu-budgie |
| 325 | ubuntu-touch daily-preinstalled ubuntu-rtm/* * ubuntu-cdimage/ubuntu-touch |
| 326 | ubuntu-touch daily-preinstalled trusty- * ubuntu-cdimage/ubuntu-touch |
| 327 | -ubuntu-touch-custom daily-preinstalled vivid- * ubuntu-cdimage/ubuntu-touch-custom |
| 328 | -ubuntu-pd daily-preinstalled * * ubuntu-cdimage/ubuntu-pd |
| 329 | ubuntu dvd -precise * ubuntu-cdimage/ubuntu-dvd |
| 330 | ubuntu-wubi wubi * * ubuntu-cdimage/ubuntu-wubi |
| 331 | -ubuntu-zh_CN daily-live -raring * ubuntu-cdimage/ubuntu-zh-cn |
| 332 | +ubuntu-zh_CN daily-live -precise * ubuntu-cdimage/ubuntu-zh-cn |
| 333 | |
| 334 | === modified file 'etc/purge-days' |
| 335 | --- etc/purge-days 2018-04-20 01:15:18 +0000 |
| 336 | +++ etc/purge-days 2019-02-28 22:59:07 +0000 |
| 337 | @@ -3,14 +3,9 @@ |
| 338 | daily-preinstalled 1 |
| 339 | # Purge images older than 2 days => keep the most recent build. |
| 340 | dvd 2 |
| 341 | -# Only purge TheOpenCDv3 images manually. |
| 342 | -tocd3/daily-live 0 |
| 343 | # Only purge ubuntu-core images manually. |
| 344 | ubuntu-core 0 |
| 345 | -ubuntu-mid 3 |
| 346 | -ubuntu-netbook 3 |
| 347 | ubuntu-touch 7 |
| 348 | -ubuntu-touch-custom 7 |
| 349 | source 1 |
| 350 | wubi 1 |
| 351 | ubuntu-zh_CN 3 |
| 352 | |
| 353 | === modified file 'etc/qa-products' |
| 354 | --- etc/qa-products 2018-11-28 15:52:36 +0000 |
| 355 | +++ etc/qa-products 2019-02-28 22:59:07 +0000 |
| 356 | @@ -11,8 +11,6 @@ |
| 357 | Kubuntu Desktop armhf+omap4 kubuntu daily-live desktop armhf+omap4 iso |
| 358 | Kubuntu Desktop i386 kubuntu daily-live desktop i386 iso |
| 359 | Kubuntu Desktop powerpc kubuntu daily-live desktop powerpc iso |
| 360 | -Kubuntu Plasma 5 Desktop amd64 kubuntu-plasma5 daily-live desktop amd64 iso |
| 361 | -Kubuntu Plasma 5 Desktop i386 kubuntu-plasma5 daily-live desktop i386 iso |
| 362 | |
| 363 | # Lubuntu |
| 364 | Lubuntu Alternate amd64 lubuntu daily alternate amd64 iso |
| 365 | @@ -53,11 +51,6 @@ |
| 366 | Ubuntu Desktop powerpc ubuntu daily-live desktop powerpc iso |
| 367 | Ubuntu Desktop Preinstalled armhf+nexus7 ubuntu daily-preinstalled preinstalled-desktop armhf+nexus7 iso |
| 368 | |
| 369 | -# Ubuntu Desktop Next |
| 370 | -Ubuntu Desktop (Unity 8) armhf ubuntu-desktop-next/system-image daily-preinstalled preinstalled-desktop-next armhf iso |
| 371 | -Ubuntu Desktop (Unity 8) amd64 ubuntu-desktop-next/system-image daily-preinstalled preinstalled-desktop-next amd64 iso |
| 372 | -Ubuntu Desktop (Unity 8) i386 ubuntu-desktop-next/system-image daily-preinstalled preinstalled-desktop-next i386 iso |
| 373 | - |
| 374 | # Ubuntu GNOME |
| 375 | Ubuntu GNOME Desktop amd64 ubuntu-gnome daily-live desktop amd64 iso |
| 376 | Ubuntu GNOME Desktop i386 ubuntu-gnome daily-live desktop i386 iso |
| 377 | @@ -97,10 +90,6 @@ |
| 378 | Ubuntu Touch armhf ubuntu-touch daily-preinstalled preinstalled-touch armhf iso |
| 379 | Ubuntu Touch i386 ubuntu-touch daily-preinstalled preinstalled-touch i386 iso |
| 380 | |
| 381 | -# Ubuntu Touch Custom |
| 382 | -Ubuntu Touch Custom armhf ubuntu-touch-custom daily-preinstalled preinstalled-touch armhf iso |
| 383 | -Ubuntu Touch Custom i386 ubuntu-touch-custom daily-preinstalled preinstalled-touch i386 iso |
| 384 | - |
| 385 | # Ubuntu Kylin |
| 386 | Ubuntu Kylin Desktop amd64 ubuntukylin daily-live desktop amd64 iso |
| 387 | Ubuntu Kylin Desktop i386 ubuntukylin daily-live desktop i386 iso |
| 388 | |
| 389 | === modified file 'lib/cdimage/build.py' |
| 390 | --- lib/cdimage/build.py 2018-01-09 01:47:28 +0000 |
| 391 | +++ lib/cdimage/build.py 2019-02-28 22:59:07 +0000 |
| 392 | @@ -80,17 +80,14 @@ |
| 393 | if project == "gobuntu": |
| 394 | config["CDIMAGE_ONLYFREE"] = "1" |
| 395 | elif project == "edubuntu": |
| 396 | - if series >= "karmic": |
| 397 | - config["CDIMAGE_UNSUPPORTED"] = "1" |
| 398 | + config["CDIMAGE_UNSUPPORTED"] = "1" |
| 399 | elif project == "xubuntu": |
| 400 | - if series >= "hardy": |
| 401 | - config["CDIMAGE_UNSUPPORTED"] = "1" |
| 402 | + config["CDIMAGE_UNSUPPORTED"] = "1" |
| 403 | elif project == "kubuntu": |
| 404 | - if series >= "quantal": |
| 405 | + if series >= "trusty": |
| 406 | config["CDIMAGE_UNSUPPORTED"] = "1" |
| 407 | elif project in ( |
| 408 | "kubuntu-active", |
| 409 | - "kubuntu-plasma5", |
| 410 | "ubuntustudio", |
| 411 | "mythbuntu", |
| 412 | "lubuntu", |
| 413 | @@ -98,8 +95,6 @@ |
| 414 | "ubuntu-gnome", |
| 415 | "ubuntu-budgie", |
| 416 | "ubuntu-mate", |
| 417 | - "ubuntu-moblin-remix", |
| 418 | - "ubuntu-mid", |
| 419 | ): |
| 420 | config["CDIMAGE_UNSUPPORTED"] = "1" |
| 421 | |
| 422 | @@ -363,66 +358,23 @@ |
| 423 | "UBUNTU_DEFAULTS_LOCALE='%s' not currently supported!" % locale) |
| 424 | |
| 425 | series = config["DIST"] |
| 426 | - if series < "oneiric": |
| 427 | - # Original hack: repack an existing image. |
| 428 | - iso = config["ISO"] |
| 429 | - if not iso: |
| 430 | - raise Exception( |
| 431 | - "Pass ISO=<path to Ubuntu image> in the environment.") |
| 432 | - |
| 433 | - scratch = os.path.join( |
| 434 | - config.root, "scratch", "ubuntu-chinese-edition", series.name) |
| 435 | - bsdtar_tree = os.path.join(scratch, "bsdtar-tree") |
| 436 | - |
| 437 | - log_marker("Unpacking") |
| 438 | - if os.path.isdir(bsdtar_tree): |
| 439 | - subprocess.check_call(["chmod", "-R", "+w", bsdtar_tree]) |
| 440 | - osextras.mkemptydir(bsdtar_tree) |
| 441 | - subprocess.check_call(["bsdtar", "-xf", iso, "-C", bsdtar_tree]) |
| 442 | - subprocess.check_call(["chmod", "-R", "+w", bsdtar_tree]) |
| 443 | - |
| 444 | - log_marker("Transforming (robots in disguise)") |
| 445 | - with open(os.path.join(bsdtar_tree, "isolinux", "lang"), "w") as lang: |
| 446 | - print(locale, file=lang) |
| 447 | - subprocess.call([ |
| 448 | - "mkisofs", |
| 449 | - "-r", "-V", "Ubuntu Chinese %s i386" % series.version, |
| 450 | - "-o", os.path.join(scratch, os.path.basename(iso)), |
| 451 | - "-cache-inodes", "-J", "-l", |
| 452 | - "-b", "isolinux/isolinux.bin", "-c", "isolinux/boot.cat", |
| 453 | - "-no-emul-boot", "-boot-load-size", "4", "-boot-info-table", |
| 454 | - bsdtar_tree, |
| 455 | - ]) |
| 456 | - |
| 457 | - iso_prefix = iso.rsplit(".", 1)[0] |
| 458 | - scratch_prefix = os.path.join( |
| 459 | - scratch, os.path.basename(iso).rsplit(".", 1)[0]) |
| 460 | - |
| 461 | - for ext in "list", "manifest": |
| 462 | - if os.path.exists("%s.%s" % (iso_prefix, ext)): |
| 463 | - shutil.copy2( |
| 464 | - "%s.%s" % (iso_prefix, ext), |
| 465 | - "%s.%s" % (scratch_prefix, ext)) |
| 466 | - else: |
| 467 | - osextras.unlink_force("%s.%s" % (scratch_prefix, ext)) |
| 468 | - else: |
| 469 | - log_marker("Downloading live filesystem images") |
| 470 | - download_live_filesystems(config) |
| 471 | - scratch = live_output_directory(config) |
| 472 | - for entry in os.listdir(scratch): |
| 473 | - if "." in entry: |
| 474 | - os.rename( |
| 475 | - os.path.join(scratch, entry), |
| 476 | - os.path.join(scratch, "%s-desktop-%s" % (series, entry))) |
| 477 | - pi_makelist = os.path.join( |
| 478 | - config.root, "debian-cd", "tools", "pi-makelist") |
| 479 | - for entry in os.listdir(scratch): |
| 480 | - if entry.endswith(".iso"): |
| 481 | - entry_path = os.path.join(scratch, entry) |
| 482 | - list_path = "%s.list" % entry_path.rsplit(".", 1)[0] |
| 483 | - with open(list_path, "w") as list_file: |
| 484 | - subprocess.check_call( |
| 485 | - [pi_makelist, entry_path], stdout=list_file) |
| 486 | + log_marker("Downloading live filesystem images") |
| 487 | + download_live_filesystems(config) |
| 488 | + scratch = live_output_directory(config) |
| 489 | + for entry in os.listdir(scratch): |
| 490 | + if "." in entry: |
| 491 | + os.rename( |
| 492 | + os.path.join(scratch, entry), |
| 493 | + os.path.join(scratch, "%s-desktop-%s" % (series, entry))) |
| 494 | + pi_makelist = os.path.join( |
| 495 | + config.root, "debian-cd", "tools", "pi-makelist") |
| 496 | + for entry in os.listdir(scratch): |
| 497 | + if entry.endswith(".iso"): |
| 498 | + entry_path = os.path.join(scratch, entry) |
| 499 | + list_path = "%s.list" % entry_path.rsplit(".", 1)[0] |
| 500 | + with open(list_path, "w") as list_file: |
| 501 | + subprocess.check_call( |
| 502 | + [pi_makelist, entry_path], stdout=list_file) |
| 503 | |
| 504 | |
| 505 | def add_android_support(config, arch, output_dir): |
| 506 | @@ -506,9 +458,8 @@ |
| 507 | "%s.model-assertion" % live_prefix, |
| 508 | "%s.model-assertion" % output_prefix) |
| 509 | |
| 510 | - if (config.project in ("ubuntu-base", "ubuntu-touch", |
| 511 | - "ubuntu-touch-custom") or |
| 512 | - (config.project in ("ubuntu-desktop-next", "ubuntu-core") and |
| 513 | + if (config.project in ("ubuntu-base", "ubuntu-touch") or |
| 514 | + (config.project == "ubuntu-core" and |
| 515 | config.subproject == "system-image")): |
| 516 | log_marker("Copying images to debian-cd output directory") |
| 517 | scratch_dir = os.path.join( |
| 518 | @@ -528,26 +479,16 @@ |
| 519 | elif config.project == "ubuntu-base": |
| 520 | output_prefix = os.path.join( |
| 521 | output_dir, "%s-base-%s" % (config.series, arch)) |
| 522 | - elif config.project in ("ubuntu-touch", "ubuntu-touch-custom"): |
| 523 | + elif config.project == "ubuntu-touch": |
| 524 | output_prefix = os.path.join( |
| 525 | output_dir, |
| 526 | "%s-preinstalled-touch-%s" % (config.series, arch)) |
| 527 | - elif config.project == "ubuntu-desktop-next": |
| 528 | - if config.image_type == "daily-preinstalled": |
| 529 | - output_prefix = os.path.join( |
| 530 | - output_dir, |
| 531 | - "%s-preinstalled-desktop-next-%s" % |
| 532 | - (config.series, arch)) |
| 533 | - else: |
| 534 | - output_prefix = os.path.join( |
| 535 | - output_dir, "%s-desktop-next-%s" % |
| 536 | - (config.series, arch)) |
| 537 | shutil.copy2(rootfs, "%s.raw" % output_prefix) |
| 538 | with open("%s.type" % output_prefix, "w") as f: |
| 539 | print("tar archive", file=f) |
| 540 | shutil.copy2( |
| 541 | "%s.manifest" % live_prefix, "%s.manifest" % output_prefix) |
| 542 | - if config.project in ("ubuntu-touch", "ubuntu-touch-custom"): |
| 543 | + if config.project == "ubuntu-touch": |
| 544 | osextras.link_force( |
| 545 | "%s.raw" % output_prefix, "%s.tar.gz" % output_prefix) |
| 546 | add_android_support(config, arch, output_dir) |
| 547 | @@ -555,7 +496,7 @@ |
| 548 | if os.path.exists(custom): |
| 549 | shutil.copy2( |
| 550 | custom, "%s.custom.tar.gz" % output_prefix) |
| 551 | - if config.project in ("ubuntu-core", "ubuntu-desktop-next"): |
| 552 | + if config.project == "ubuntu-core": |
| 553 | for dev in ("azure.device", "device", "raspi2.device", |
| 554 | "plano.device"): |
| 555 | device = "%s.%s.tar.gz" % (live_prefix, dev) |
| 556 | @@ -571,10 +512,7 @@ |
| 557 | |
| 558 | |
| 559 | def _debootstrap_script(config): |
| 560 | - if config["DIST"] <= "gutsy": |
| 561 | - return "usr/lib/debootstrap/scripts/%s" % config.series |
| 562 | - else: |
| 563 | - return "usr/share/debootstrap/scripts/%s" % config.series |
| 564 | + return "usr/share/debootstrap/scripts/%s" % config.series |
| 565 | |
| 566 | |
| 567 | def extract_debootstrap(config): |
| 568 | @@ -710,15 +648,11 @@ |
| 569 | def is_live_fs_only(config): |
| 570 | live_fs_only = False |
| 571 | if config.project in ( |
| 572 | - "livecd-base", "ubuntu-base", "ubuntu-core", "ubuntu-touch", |
| 573 | - "ubuntu-touch-custom"): |
| 574 | + "livecd-base", "ubuntu-base", "ubuntu-core", "ubuntu-touch"): |
| 575 | live_fs_only = True |
| 576 | elif (config.project == "ubuntu-server" and |
| 577 | config.image_type == "daily-preinstalled"): |
| 578 | live_fs_only = True |
| 579 | - elif (config.project == "ubuntu-desktop-next" and |
| 580 | - config.subproject == "system-image"): |
| 581 | - live_fs_only = True |
| 582 | elif config.subproject == "wubi": |
| 583 | live_fs_only = True |
| 584 | return live_fs_only |
| 585 | |
| 586 | === modified file 'lib/cdimage/germinate.py' |
| 587 | --- lib/cdimage/germinate.py 2019-02-22 10:32:26 +0000 |
| 588 | +++ lib/cdimage/germinate.py 2019-02-28 22:59:07 +0000 |
| 589 | @@ -72,20 +72,14 @@ |
| 590 | gitpattern = "https://git.launchpad.net/~%s/ubuntu-seeds/+git/" |
| 591 | series = self.config["DIST"] |
| 592 | sources = [gitpattern % "ubuntu-core-dev"] |
| 593 | - if project in ("kubuntu", "kubuntu-active", "kubuntu-plasma5"): |
| 594 | - if series >= "oneiric": |
| 595 | - sources.insert(0, bzrpattern % "kubuntu-dev") |
| 596 | - else: |
| 597 | - sources.insert(0, bzrpattern % "ubuntu-core-dev") |
| 598 | + if project in ("kubuntu", "kubuntu-active"): |
| 599 | + sources.insert(0, bzrpattern % "kubuntu-dev") |
| 600 | elif project == "ubuntustudio": |
| 601 | sources.insert(0, gitpattern % "ubuntustudio-dev") |
| 602 | elif project == "mythbuntu": |
| 603 | sources.insert(0, bzrpattern % "mythbuntu-dev") |
| 604 | elif project == "xubuntu": |
| 605 | - if series >= "intrepid": |
| 606 | - sources.insert(0, gitpattern % "xubuntu-dev") |
| 607 | - else: |
| 608 | - sources.insert(0, bzrpattern % "ubuntu-core-dev") |
| 609 | + sources.insert(0, gitpattern % "xubuntu-dev") |
| 610 | elif project in ("lubuntu", "lubuntu-next"): |
| 611 | sources.insert(0, gitpattern % "lubuntu-dev") |
| 612 | elif project == "ubuntu-gnome": |
| 613 | @@ -94,10 +88,8 @@ |
| 614 | sources.insert(0, bzrpattern % "ubuntubudgie-dev") |
| 615 | elif project == "ubuntu-mate": |
| 616 | sources.insert(0, bzrpattern % "ubuntu-mate-dev") |
| 617 | - elif project == "ubuntu-moblin-remix": |
| 618 | - sources.insert(0, bzrpattern % "moblin") |
| 619 | elif project == "ubuntukylin": |
| 620 | - if series >= "utopic": |
| 621 | + if series >= "xenial": |
| 622 | sources.insert(0, gitpattern % "ubuntukylin-members") |
| 623 | else: |
| 624 | sources.insert(0, bzrpattern % "ubuntu-core-dev") |
| 625 | @@ -138,24 +130,13 @@ |
| 626 | return [pattern % self.config.series for pattern in dist_patterns] |
| 627 | |
| 628 | def seed_dist(self, project): |
| 629 | - if (project in ("ubuntu-server", "jeos") and |
| 630 | - self.config.series != "breezy"): |
| 631 | + if project == "ubuntu-server": |
| 632 | return "ubuntu.%s" % self.config.series |
| 633 | elif project == "ubuntukylin": |
| 634 | - if self.config["DIST"] >= "utopic": |
| 635 | + if self.config["DIST"] >= "xenial": |
| 636 | return "ubuntukylin.%s" % self.config.series |
| 637 | else: |
| 638 | return "ubuntu.%s" % self.config.series |
| 639 | - elif project == "ubuntu-mid": |
| 640 | - return "mobile.%s" % self.config.series |
| 641 | - elif project == "ubuntu-netbook": |
| 642 | - return "netbook.%s" % self.config.series |
| 643 | - elif project == "ubuntu-headless": |
| 644 | - return "ubuntu.%s" % self.config.series |
| 645 | - elif project == "ubuntu-moblin-remix": |
| 646 | - return "moblin.%s" % self.config.series |
| 647 | - elif project == "ubuntu-desktop-next": |
| 648 | - return "ubuntu-touch.%s" % self.config.series |
| 649 | elif project == "lubuntu-next": |
| 650 | return "lubuntu.%s" % self.config.series |
| 651 | else: |
| 652 | @@ -218,24 +199,6 @@ |
| 653 | shutil.copy2( |
| 654 | os.path.join(arch_output_dir, "structure"), output_structure) |
| 655 | |
| 656 | - if self.config.series == "breezy": |
| 657 | - # Unfortunately, we now need a second germinate run to figure |
| 658 | - # out the dependencies of language packs and the like. |
| 659 | - extras = [] |
| 660 | - with open(os.path.join( |
| 661 | - arch_output_dir, "ship.acsets"), "w") as ship_acsets: |
| 662 | - output = GerminateOutput(self.config, output_structure) |
| 663 | - for pkg in output.seed_packages(arch, "ship.seed"): |
| 664 | - extras.append("desktop/%s" % pkg) |
| 665 | - print(pkg, file=ship_acsets) |
| 666 | - if extras: |
| 667 | - logger.info( |
| 668 | - "Re-germinating for %s/%s language pack dependencies ..." % |
| 669 | - (self.config.series, arch)) |
| 670 | - command.extend(["--seed-packages", ",".join(extras)]) |
| 671 | - proxy_check_call( |
| 672 | - self.config, "germinate", command, cwd=arch_output_dir) |
| 673 | - |
| 674 | def germinate_project(self, project): |
| 675 | osextras.mkemptydir(self.output_dir(project)) |
| 676 | |
| 677 | @@ -314,17 +277,10 @@ |
| 678 | ship = "ship-addon" |
| 679 | in_squashfs = None |
| 680 | if project == "ubuntu-server": |
| 681 | - if series <= "breezy": |
| 682 | - pass |
| 683 | - elif series <= "dapper": |
| 684 | - ship = "server" |
| 685 | - else: |
| 686 | - ship = "server-ship" |
| 687 | + ship = "server-ship" |
| 688 | in_squashfs = ["minimal"] |
| 689 | elif project == "kubuntu-active": |
| 690 | ship = "active-ship" |
| 691 | - elif project == "jeos": |
| 692 | - ship = "jeos" |
| 693 | seeds = self._inheritance(ship) |
| 694 | if (self.config["CDIMAGE_SQUASHFS_BASE"] and |
| 695 | in_squashfs is not None): |
| 696 | @@ -333,55 +289,33 @@ |
| 697 | for seed in seeds: |
| 698 | yield seed |
| 699 | if self.config["CDIMAGE_DVD"]: |
| 700 | - if series >= "edgy": |
| 701 | - # TODO cjwatson 2007-04-18: hideous hack to fix DVD tasks |
| 702 | - yield "dns-server" |
| 703 | - yield "lamp-server" |
| 704 | + # TODO cjwatson 2007-04-18: hideous hack to fix DVD tasks |
| 705 | + yield "dns-server" |
| 706 | + yield "lamp-server" |
| 707 | elif mode == "installer": |
| 708 | if self.config["CDIMAGE_INSTALL_BASE"]: |
| 709 | yield "installer" |
| 710 | - if self.config["CDIMAGE_LIVE"]: |
| 711 | - if series >= "hoary" and series <= "breezy": |
| 712 | - yield "casper" |
| 713 | elif mode == "debootstrap": |
| 714 | - if series <= "hoary": |
| 715 | - yield "base" |
| 716 | - elif series <= "feisty": |
| 717 | - yield "minimal" |
| 718 | - else: |
| 719 | - yield "required" |
| 720 | - yield "minimal" |
| 721 | + yield "required" |
| 722 | + yield "minimal" |
| 723 | elif mode == "base": |
| 724 | - if series <= "hoary": |
| 725 | - yield "base" |
| 726 | - elif series <= "breezy": |
| 727 | - yield "minimal" |
| 728 | - yield "standard" |
| 729 | - elif series <= "feisty": |
| 730 | - yield "boot" |
| 731 | - yield "minimal" |
| 732 | - yield "standard" |
| 733 | - else: |
| 734 | - yield "boot" |
| 735 | - yield "required" |
| 736 | - yield "minimal" |
| 737 | - yield "standard" |
| 738 | + yield "boot" |
| 739 | + yield "required" |
| 740 | + yield "minimal" |
| 741 | + yield "standard" |
| 742 | elif mode == "ship-live": |
| 743 | if project == "kubuntu-active": |
| 744 | yield "ship-active-live" |
| 745 | - elif (project == "lubuntu" and series >= "artful" |
| 746 | - and series <= "bionic"): |
| 747 | + elif project == "lubuntu" and series == "bionic": |
| 748 | yield "ship-live-gtk" |
| 749 | yield "ship-live-share" |
| 750 | - elif (project == "lubuntu-next" and series >= "artful" |
| 751 | - and series <= "bionic"): |
| 752 | + elif project == "lubuntu-next" and series == "bionic": |
| 753 | yield "ship-live-qt" |
| 754 | yield "ship-live-share" |
| 755 | elif project == "ubuntu-server" and series >= "bionic": |
| 756 | yield "server-ship-live" |
| 757 | else: |
| 758 | - if series >= "dapper": |
| 759 | - yield "ship-live" |
| 760 | + yield "ship-live" |
| 761 | elif mode == "addon": |
| 762 | ship = self._inheritance("ship") |
| 763 | ship_addon = self._inheritance("ship-addon") |
| 764 | @@ -389,29 +323,22 @@ |
| 765 | if seed not in ship: |
| 766 | yield seed |
| 767 | elif mode == "dvd": |
| 768 | - if series <= "gutsy": |
| 769 | - for seed in self._inheritance("supported"): |
| 770 | - yield seed |
| 771 | - elif series <= "karmic": |
| 772 | + if project == "edubuntu": |
| 773 | + # no inheritance; most of this goes on the live filesystem |
| 774 | + yield "dvd" |
| 775 | + yield "ship-live" |
| 776 | + elif project == "ubuntu": |
| 777 | + # no inheritance; most of this goes on the live filesystem |
| 778 | + yield "usb-langsupport" |
| 779 | + yield "usb-ship-live" |
| 780 | + elif project == "ubuntustudio": |
| 781 | + # no inheritance; most of this goes on the live filesystem |
| 782 | + yield "dvd" |
| 783 | + if series >= "bionic": |
| 784 | + yield "ship-live" |
| 785 | + else: |
| 786 | for seed in self._inheritance("dvd"): |
| 787 | yield seed |
| 788 | - else: |
| 789 | - if project == "edubuntu": |
| 790 | - # no inheritance; most of this goes on the live filesystem |
| 791 | - yield "dvd" |
| 792 | - yield "ship-live" |
| 793 | - elif project == "ubuntu" and series >= "oneiric": |
| 794 | - # no inheritance; most of this goes on the live filesystem |
| 795 | - yield "usb-langsupport" |
| 796 | - yield "usb-ship-live" |
| 797 | - elif project == "ubuntustudio" and series >= "precise": |
| 798 | - # no inheritance; most of this goes on the live filesystem |
| 799 | - yield "dvd" |
| 800 | - if series >= "artful": |
| 801 | - yield "ship-live" |
| 802 | - else: |
| 803 | - for seed in self._inheritance("dvd"): |
| 804 | - yield seed |
| 805 | |
| 806 | def seed_path(self, arch, seed): |
| 807 | return os.path.join(self.directory, arch, seed) |
| 808 | @@ -492,24 +419,6 @@ |
| 809 | if package == "bootstrap-base": |
| 810 | package = "live-installer" |
| 811 | |
| 812 | - # germinate doesn't yet support subarchitecture specifications |
| 813 | - # (and it's not entirely clear what they would mean if it did), |
| 814 | - # so we need to hack the boot and installer seeds a bit for |
| 815 | - # powerpc+ps3 (only gutsy). |
| 816 | - if self.config.series == "gutsy" and arch == "powerpc+ps3": |
| 817 | - if seed in installer_seeds: |
| 818 | - if "-powerpc-di" in package: |
| 819 | - continue |
| 820 | - package = package.replace("-powerpc64-smp-di", "-cell-di") |
| 821 | - if seed == "boot": |
| 822 | - if package.startswith("linux-restricted-modules"): |
| 823 | - continue |
| 824 | - if package.startswith("linux-ubuntu-modules"): |
| 825 | - continue |
| 826 | - if package.endswith("-powerpc"): |
| 827 | - continue |
| 828 | - package = package.replace("-powerpc64-smp", "-cell") |
| 829 | - |
| 830 | # For precise, some flavours use a different kernel on i386. |
| 831 | # germinate doesn't currently support this without duplicating |
| 832 | # the entire boot and installer seeds, so we hack them instead. |
| 833 | @@ -523,7 +432,7 @@ |
| 834 | yield package |
| 835 | |
| 836 | def installer_initrds(self, cpuarch): |
| 837 | - if cpuarch in ("amd64", "i386", "lpia"): |
| 838 | + if cpuarch in ("amd64", "i386"): |
| 839 | return ["cdrom/initrd.gz", "netboot/netboot.tar.gz"] |
| 840 | elif cpuarch == "hppa": |
| 841 | return ["cdrom/2.6/initrd.gz", "netboot/2.6/boot.img"] |
| 842 | @@ -567,16 +476,15 @@ |
| 843 | |
| 844 | def common_initrd_packages(self, arch): |
| 845 | initrd_packages_sets = [] |
| 846 | - if self.config["DIST"] >= "jaunty": |
| 847 | - # Remove installer packages that are in both the cdrom and |
| 848 | - # netboot initrds; there's no point duplicating these. |
| 849 | - cpuarch = arch.split("+")[0] |
| 850 | - initrds = self.installer_initrds(cpuarch) |
| 851 | - subarches = self.installer_subarches(cpuarch) |
| 852 | - for initrd in initrds: |
| 853 | - for subarch in subarches: |
| 854 | - initrd_packages_sets.append(self.initrd_packages( |
| 855 | - "%s/%s" % (subarch, initrd), cpuarch)) |
| 856 | + # Remove installer packages that are in both the cdrom and |
| 857 | + # netboot initrds; there's no point duplicating these. |
| 858 | + cpuarch = arch.split("+")[0] |
| 859 | + initrds = self.installer_initrds(cpuarch) |
| 860 | + subarches = self.installer_subarches(cpuarch) |
| 861 | + for initrd in initrds: |
| 862 | + for subarch in subarches: |
| 863 | + initrd_packages_sets.append(self.initrd_packages( |
| 864 | + "%s/%s" % (subarch, initrd), cpuarch)) |
| 865 | if initrd_packages_sets: |
| 866 | return set.intersection(*initrd_packages_sets) |
| 867 | else: |
| 868 | @@ -584,7 +492,7 @@ |
| 869 | |
| 870 | def task_project(self, project): |
| 871 | # ubuntu-server really wants ubuntu-* tasks. |
| 872 | - if project in ("ubuntu-server", "jeos"): |
| 873 | + if project == "ubuntu-server": |
| 874 | return "ubuntu" |
| 875 | else: |
| 876 | return project |
| 877 | @@ -607,55 +515,24 @@ |
| 878 | return headers |
| 879 | |
| 880 | def seed_task_mapping(self, project, arch): |
| 881 | - series = self.config["DIST"] |
| 882 | task_project = self.task_project(project) |
| 883 | for seed in self.list_seeds("all"): |
| 884 | - if series <= "dapper": |
| 885 | - # Tasks implemented by hand. |
| 886 | - if seed in ("boot", "required", "server-ship"): |
| 887 | - continue |
| 888 | - elif seed == "server" and project != "edubuntu": |
| 889 | - continue |
| 890 | - elif seed == "ship" and series >= "dapper": |
| 891 | - continue |
| 892 | - |
| 893 | - if seed in ( |
| 894 | - "base", "minimal", "standard", "desktop", "server", "ship", |
| 895 | - ): |
| 896 | - task = "%s-%s" % (task_project, seed) |
| 897 | - else: |
| 898 | - task = seed |
| 899 | - input_seeds = [seed] |
| 900 | - elif series <= "gutsy": |
| 901 | - # Tasks implemented via tasksel, but without Task-Seeds; |
| 902 | - # hacks required for seed/task mapping. |
| 903 | - if seed == "required": |
| 904 | - task = "minimal" |
| 905 | - else: |
| 906 | - task = seed |
| 907 | - headers = self.task_headers(arch, seed) |
| 908 | - if not headers: |
| 909 | - continue |
| 910 | - if "per-derivative" in headers: |
| 911 | + # Tasks implemented via tasksel, with Task-Seeds to indicate |
| 912 | + # task/seed mapping. |
| 913 | + task = seed |
| 914 | + headers = self.task_headers(arch, seed) |
| 915 | + if not headers: |
| 916 | + continue |
| 917 | + input_seeds = [seed] + headers.get("seeds", "").split() |
| 918 | + if "per-derivative" in headers: |
| 919 | + # Edubuntu is odd; it's structured as an add-on to |
| 920 | + # Ubuntu, so sometimes we need to create ubuntu-* tasks. |
| 921 | + # At the moment I don't see a better approach than |
| 922 | + # hardcoding the task names. |
| 923 | + if project == "edubuntu" and task in ("desktop", "live"): |
| 924 | + task = "ubuntu-%s" % task |
| 925 | + else: |
| 926 | task = "%s-%s" % (task_project, task) |
| 927 | - input_seeds = [seed] |
| 928 | - else: |
| 929 | - # Tasks implemented via tasksel, with Task-Seeds to indicate |
| 930 | - # task/seed mapping. |
| 931 | - task = seed |
| 932 | - headers = self.task_headers(arch, seed) |
| 933 | - if not headers: |
| 934 | - continue |
| 935 | - input_seeds = [seed] + headers.get("seeds", "").split() |
| 936 | - if "per-derivative" in headers: |
| 937 | - # Edubuntu is odd; it's structured as an add-on to |
| 938 | - # Ubuntu, so sometimes we need to create ubuntu-* tasks. |
| 939 | - # At the moment I don't see a better approach than |
| 940 | - # hardcoding the task names. |
| 941 | - if project == "edubuntu" and task in ("desktop", "live"): |
| 942 | - task = "ubuntu-%s" % task |
| 943 | - else: |
| 944 | - task = "%s-%s" % (task_project, task) |
| 945 | |
| 946 | yield input_seeds, task |
| 947 | |
| 948 | @@ -664,7 +541,6 @@ |
| 949 | master_project = "source" |
| 950 | else: |
| 951 | master_project = project |
| 952 | - series = self.config["DIST"] |
| 953 | output_dir = self.tasks_output_dir(master_project) |
| 954 | osextras.ensuredir(output_dir) |
| 955 | |
| 956 | @@ -706,27 +582,6 @@ |
| 957 | print( |
| 958 | "%s Task %s" % (pkg, ", ".join(tasknames)), |
| 959 | file=override) |
| 960 | - if series == "breezy": |
| 961 | - # In breezy, also generate Archive-Copier-Set headers for |
| 962 | - # sets of packages that archive-copier needs to know to copy |
| 963 | - # but that shouldn't appear as tasks in aptitude et al. |
| 964 | - ship_acsets_path = self.seed_path(arch, "ship.acsets") |
| 965 | - all_acsets = defaultdict(list) |
| 966 | - try: |
| 967 | - with open(ship_acsets_path) as ship_acsets: |
| 968 | - for acset in ship_acsets: |
| 969 | - acset = acset.rstrip("\n") |
| 970 | - for package in self.seed_packages(arch, acset): |
| 971 | - all_acsets[package].append(acset) |
| 972 | - except IOError as e: |
| 973 | - if e.errno != errno.ENOENT: |
| 974 | - raise |
| 975 | - for pkg, acsetnames in sorted(all_acsets.items()): |
| 976 | - print( |
| 977 | - "%s Archive-Copier-Set %s" % ( |
| 978 | - pkg, ", ".join(acsetnames)), |
| 979 | - file=override) |
| 980 | - |
| 981 | # Help debian-cd to get priorities in sync with the current base |
| 982 | # system, so that debootstrap >= 0.3.1 can work out the correct |
| 983 | # set of packages to install. |
| 984 | |
| 985 | === modified file 'lib/cdimage/livefs.py' |
| 986 | --- lib/cdimage/livefs.py 2018-12-12 20:29:20 +0000 |
| 987 | +++ lib/cdimage/livefs.py 2019-02-28 22:59:07 +0000 |
| 988 | @@ -34,7 +34,7 @@ |
| 989 | from urllib2 import URLError, unquote, urlopen |
| 990 | |
| 991 | from cdimage import osextras, sign |
| 992 | -from cdimage.config import Series, Touch |
| 993 | +from cdimage.config import Touch |
| 994 | from cdimage.launchpad import get_launchpad |
| 995 | from cdimage.log import logger |
| 996 | from cdimage.mail import get_notify_addresses, send_mail |
| 997 | @@ -121,14 +121,11 @@ |
| 998 | elif subarch in ("ac100", "nexus7"): |
| 999 | options.extend(["-f", "plain"]) |
| 1000 | |
| 1001 | - if (config.project in ("ubuntu-base", "ubuntu-core", "ubuntu-touch", |
| 1002 | - "ubuntu-touch-custom") or |
| 1003 | - (config.project == "ubuntu-desktop-next" and |
| 1004 | - config.subproject == "system-image")): |
| 1005 | + if config.project in ("ubuntu-base", "ubuntu-core", "ubuntu-touch"): |
| 1006 | options.extend(["-f", "plain"]) |
| 1007 | |
| 1008 | if config.subproject == "wubi": |
| 1009 | - if config["DIST"] >= "quantal": |
| 1010 | + if config["DIST"] >= "trusty": |
| 1011 | # TODO: Turn this back on once Wubi's resize2fs supports it. |
| 1012 | # options.extend(["-f", "ext4"]) |
| 1013 | options.extend(["-f", "ext3"]) |
| 1014 | @@ -140,14 +137,9 @@ |
| 1015 | |
| 1016 | def live_project(config, arch): |
| 1017 | project = config.project |
| 1018 | - series = config["DIST"] |
| 1019 | |
| 1020 | if project == "livecd-base": |
| 1021 | liveproject = "base" |
| 1022 | - elif project == "tocd3.1": |
| 1023 | - liveproject = "tocd" |
| 1024 | - elif project == "ubuntu-touch-custom": |
| 1025 | - liveproject = "ubuntu-touch" |
| 1026 | elif (project == "ubuntu-server" and |
| 1027 | config.image_type == "daily-preinstalled"): |
| 1028 | liveproject = "ubuntu-cpc" |
| 1029 | @@ -155,13 +147,9 @@ |
| 1030 | liveproject = project |
| 1031 | |
| 1032 | cpuarch, subarch = split_arch(arch) |
| 1033 | - if cpuarch == "lpia" and series <= "hardy": |
| 1034 | - liveproject = "%s-lpia" % liveproject |
| 1035 | |
| 1036 | if config["CDIMAGE_DVD"]: |
| 1037 | - if ((project in ("ubuntu", "kubuntu") and series >= "hardy") or |
| 1038 | - (project == "edubuntu" and series >= "karmic") or |
| 1039 | - (project == "ubuntustudio" and series >= "precise")): |
| 1040 | + if project in ("ubuntu", "kubuntu", "edubuntu", "ubuntustudio"): |
| 1041 | liveproject += "-dvd" |
| 1042 | |
| 1043 | return liveproject |
| 1044 | @@ -176,8 +164,7 @@ |
| 1045 | |
| 1046 | if config["UBUNTU_DEFAULTS_LOCALE"]: |
| 1047 | command.extend(["-u", config["UBUNTU_DEFAULTS_LOCALE"]]) |
| 1048 | - elif config["DIST"] >= "oneiric": |
| 1049 | - command.append("-l") |
| 1050 | + command.append("-l") |
| 1051 | |
| 1052 | command.extend(live_build_options(config, arch)) |
| 1053 | |
| 1054 | @@ -482,28 +469,19 @@ |
| 1055 | series = config["DIST"] |
| 1056 | |
| 1057 | if cpuarch == "amd64": |
| 1058 | - if series <= "dapper": |
| 1059 | - return ["amd64-generic"] |
| 1060 | - elif series <= "oneiric": |
| 1061 | + if project == "ubuntustudio": |
| 1062 | + return ["lowlatency"] |
| 1063 | + else: |
| 1064 | return ["generic"] |
| 1065 | - else: |
| 1066 | - if project == "ubuntustudio": |
| 1067 | - return ["lowlatency"] |
| 1068 | - else: |
| 1069 | - return ["generic"] |
| 1070 | elif cpuarch == "arm64": |
| 1071 | return ["generic"] |
| 1072 | elif cpuarch == "armel": |
| 1073 | - if series == "jaunty": |
| 1074 | - # We don't have any fallback flavour on armel. |
| 1075 | - return ["imx51"] |
| 1076 | + if subarch == "mx5": |
| 1077 | + return ["linaro-lt-mx5"] |
| 1078 | else: |
| 1079 | - if subarch == "mx5": |
| 1080 | - return ["linaro-lt-mx5"] |
| 1081 | - else: |
| 1082 | - # Assume one kernel flavour for each subarch named like the |
| 1083 | - # subarch. |
| 1084 | - return [subarch] |
| 1085 | + # Assume one kernel flavour for each subarch named like the |
| 1086 | + # subarch. |
| 1087 | + return [subarch] |
| 1088 | elif cpuarch == "armhf": |
| 1089 | if subarch == "mx5": |
| 1090 | return ["linaro-lt-mx5"] |
| 1091 | @@ -512,11 +490,7 @@ |
| 1092 | elif cpuarch == "hppa": |
| 1093 | return ["hppa32", "hppa64"] |
| 1094 | elif cpuarch == "i386": |
| 1095 | - if series <= "dapper": |
| 1096 | - return ["i386"] |
| 1097 | - elif series <= "oneiric": |
| 1098 | - return ["generic"] |
| 1099 | - elif series <= "precise": |
| 1100 | + if series <= "precise": |
| 1101 | if project in ("ubuntu", "edubuntu", "mythbuntu"): |
| 1102 | # lts-quantal |
| 1103 | return ["generic"] |
| 1104 | @@ -533,20 +507,9 @@ |
| 1105 | else: |
| 1106 | return ["generic"] |
| 1107 | elif cpuarch == "ia64": |
| 1108 | - if series <= "dapper": |
| 1109 | - return ["itanium-smp", "mckinley-smp"] |
| 1110 | - elif series <= "jaunty": |
| 1111 | - return ["itanium", "mckinley"] |
| 1112 | - else: |
| 1113 | - return ["ia64"] |
| 1114 | - elif cpuarch == "lpia": |
| 1115 | - return ["lpia"] |
| 1116 | + return ["ia64"] |
| 1117 | elif cpuarch == "powerpc": |
| 1118 | - if subarch == "ps3" and series <= "gutsy": |
| 1119 | - return ["cell"] |
| 1120 | - elif series <= "oneiric": |
| 1121 | - return ["powerpc", "powerpc64-smp"] |
| 1122 | - elif series <= "xenial": |
| 1123 | + if series <= "xenial": |
| 1124 | return ["powerpc-smp", "powerpc64-smp"] |
| 1125 | else: |
| 1126 | return ["powerpc-smp", "generic"] |
| 1127 | @@ -561,61 +524,6 @@ |
| 1128 | "No live filesystem source known for %s" % arch) |
| 1129 | |
| 1130 | |
| 1131 | -def live_item_path_winfoss(config, arch): |
| 1132 | - # This is a mess of special cases. Fortunately it is now only of |
| 1133 | - # historical interest. |
| 1134 | - cpuarch, subarch = split_arch(arch) |
| 1135 | - project = config.project |
| 1136 | - series = config["DIST"] |
| 1137 | - |
| 1138 | - if series == "warty" or cpuarch not in ("amd64", "i386"): |
| 1139 | - return |
| 1140 | - |
| 1141 | - maitri = "http://maitri.ubuntu.com/theopencd" |
| 1142 | - henrik = "http://people.canonical.com/~henrik/winfoss" |
| 1143 | - |
| 1144 | - if project == "ubuntu": |
| 1145 | - if series == "hoary": |
| 1146 | - if cpuarch == "i386": |
| 1147 | - yield "%s/ubuntu/winfoss/latest/Hoary-WinFOSS.tgz" % maitri |
| 1148 | - elif cpuarch == "amd64": |
| 1149 | - yield ("%s/ubuntu/amd64/latest/" |
| 1150 | - "Hoary-WinFOSS-amd64.tgz" % maitri) |
| 1151 | - elif series == "breezy": |
| 1152 | - yield "%s/winfoss/ubuntu/current/Ubuntu-WinFOSS-5.10.tgz" % maitri |
| 1153 | - elif series >= "dapper" and series <= "karmic": |
| 1154 | - if series > "gutsy": |
| 1155 | - series = Series.find_by_name("gutsy") |
| 1156 | - yield "%s/%s/ubuntu/current/ubuntu-winfoss-%s.tar.gz" % ( |
| 1157 | - henrik, series, series.version) |
| 1158 | - elif project == "kubuntu": |
| 1159 | - if series == "hoary" and cpuarch == "i386": |
| 1160 | - yield ("%s/kubuntu/winfoss/latest/" |
| 1161 | - "Kubuntu-WinFOSS-i386.tgz" % maitri) |
| 1162 | - elif series == "breezy": |
| 1163 | - if cpuarch == "i386": |
| 1164 | - yield ("%s/winfoss/kubuntu/current/" |
| 1165 | - "Kubuntu-WinFOSS-5.10.tgz" % maitri) |
| 1166 | - elif cpuarch == "amd64": |
| 1167 | - yield ("%s/winfoss/kubuntu-AMD/current/" |
| 1168 | - "Kubuntu-WinFOSS-5.10-AMD.tgz" % maitri) |
| 1169 | - elif series >= "dapper" and series <= "karmic": |
| 1170 | - if series > "gutsy": |
| 1171 | - series = Series.find_by_name("gutsy") |
| 1172 | - yield "%s/%s/kubuntu/current/kubuntu-winfoss-%s.tar.gz" % ( |
| 1173 | - henrik, series, series.version) |
| 1174 | - elif project == "edubuntu": |
| 1175 | - if series >= "feisty" and series <= "karmic": |
| 1176 | - if series > "gutsy": |
| 1177 | - series = Series.find_by_name("gutsy") |
| 1178 | - yield "%s/%s/edubuntu/current/edubuntu-winfoss-%s.tar.gz" % ( |
| 1179 | - henrik, series, series.version) |
| 1180 | - elif project == "tocd3" and cpuarch == "i386": |
| 1181 | - yield "%s/tocd3/fsm/TOCD3.tgz" % maitri |
| 1182 | - elif project == "tocd3.1" and cpuarch == "i386": |
| 1183 | - yield "%s/winfoss/tocd3.1/current/TOCD-31.tgz" % maitri |
| 1184 | - |
| 1185 | - |
| 1186 | def live_item_paths(config, arch, item): |
| 1187 | if item == "ltsp-squashfs" and arch == "amd64": |
| 1188 | # use i386 LTSP image on amd64 too |
| 1189 | @@ -657,14 +565,7 @@ |
| 1190 | "maas-rack.squashfs", "maas-region.squashfs", |
| 1191 | "img.xz", "model-assertion" |
| 1192 | ): |
| 1193 | - if project == "tocd3": |
| 1194 | - # auto-purged - reverting to plan B |
| 1195 | - yield "/home/cjwatson/tocd3/livecd.tocd3.%s" % item |
| 1196 | - elif project == "ubuntu" and series == "breezy": |
| 1197 | - # auto-purged - reverting to plan B |
| 1198 | - yield "/home/cjwatson/breezy-live/ubuntu/livecd.%s.%s" % ( |
| 1199 | - arch, item) |
| 1200 | - elif item == "ext4" and arch == "armhf+nexus7": |
| 1201 | + if item == "ext4" and arch == "armhf+nexus7": |
| 1202 | for url in urls_for( |
| 1203 | "livecd.%s.%s-nexus7" % (liveproject_subarch, item)): |
| 1204 | yield url |
| 1205 | @@ -705,17 +606,10 @@ |
| 1206 | liveproject_subarch, flavour) |
| 1207 | for url in urls_for(base): |
| 1208 | yield url |
| 1209 | - elif item == "winfoss": |
| 1210 | - for path in live_item_path_winfoss(config, arch): |
| 1211 | - yield path |
| 1212 | elif item == "wubi": |
| 1213 | - if (project != "xubuntu" and arch in ("amd64", "i386") and |
| 1214 | - series >= "gutsy"): |
| 1215 | + if (project != "xubuntu" and arch in ("amd64", "i386")): |
| 1216 | yield ("http://people.canonical.com/~ubuntu-archive/wubi/%s/" |
| 1217 | "stable" % series) |
| 1218 | - elif item == "umenu": |
| 1219 | - if arch in ("amd64", "i386") and series == "hardy": |
| 1220 | - yield "http://people.canonical.com/~evand/umenu/stable" |
| 1221 | elif item == "usb-creator": |
| 1222 | if arch in ("amd64", "i386"): |
| 1223 | yield ("http://people.canonical.com/~evand/usb-creator/%s/" |
| 1224 | @@ -824,20 +718,13 @@ |
| 1225 | found = True |
| 1226 | except osextras.FetchError: |
| 1227 | pass |
| 1228 | - elif item in ("wubi", "umenu", "usb-creator"): |
| 1229 | + elif item in ("wubi", "usb-creator"): |
| 1230 | target = os.path.join(output_dir, "%s.%s.exe" % (arch, item)) |
| 1231 | try: |
| 1232 | osextras.fetch(config, urls[0], target) |
| 1233 | found = True |
| 1234 | except osextras.FetchError: |
| 1235 | pass |
| 1236 | - elif item == "winfoss": |
| 1237 | - target = os.path.join(output_dir, "%s.%s.tgz" % (arch, item)) |
| 1238 | - try: |
| 1239 | - osextras.fetch(config, urls[0], target) |
| 1240 | - found = True |
| 1241 | - except osextras.FetchError: |
| 1242 | - pass |
| 1243 | else: |
| 1244 | target = os.path.join(output_dir, "%s.%s" % (arch, item)) |
| 1245 | try: |
| 1246 | @@ -920,8 +807,7 @@ |
| 1247 | got_image = True |
| 1248 | else: |
| 1249 | continue |
| 1250 | - if (series >= "dapper" and |
| 1251 | - project != "ubuntu-base" and |
| 1252 | + if (project != "ubuntu-base" and |
| 1253 | not config["CDIMAGE_SQUASHFS_BASE"] and |
| 1254 | config.subproject != "wubi"): |
| 1255 | download_live_items(config, arch, "kernel") |
| 1256 | @@ -943,21 +829,9 @@ |
| 1257 | |
| 1258 | if (project not in ("livecd-base", "ubuntu-base", "ubuntu-core", |
| 1259 | "kubuntu-active") and |
| 1260 | - (project != "ubuntu-desktop-next" or |
| 1261 | - config.subproject == "system-image") and |
| 1262 | (project != "edubuntu" or series >= "precise") and |
| 1263 | - (project != "ubuntukylin" or series < "utopic")): |
| 1264 | - if series <= "feisty": |
| 1265 | - pass |
| 1266 | - elif series <= "intrepid": |
| 1267 | - if config["CDIMAGE_DVD"] != "1": |
| 1268 | - download_live_items(config, arch, "wubi") |
| 1269 | - download_live_items(config, arch, "umenu") |
| 1270 | - umenu_path = os.path.join( |
| 1271 | - output_dir, "%s.umenu.exe" % arch) |
| 1272 | - if os.path.exists(umenu_path): |
| 1273 | - write_autorun(config, arch, "umenu.exe", "Install") |
| 1274 | - elif series <= "vivid": |
| 1275 | + (project != "ubuntukylin" or series <= "trusty")): |
| 1276 | + if series <= "trusty": |
| 1277 | # TODO: We still have to do something about not |
| 1278 | # including Wubi on the DVDs. |
| 1279 | download_live_items(config, arch, "wubi") |
| 1280 | @@ -976,19 +850,15 @@ |
| 1281 | "Install %s" % autorun_project) |
| 1282 | |
| 1283 | if project not in ("livecd-base", "ubuntu-base", "ubuntu-core", |
| 1284 | - "ubuntu-desktop-next", "edubuntu"): |
| 1285 | - if (project in ("kubuntu-active", "ubuntu-netbook", |
| 1286 | - "ubuntu-moblin-remix") or |
| 1287 | - config["CDIMAGE_DVD"] or |
| 1288 | - series >= "maverick"): |
| 1289 | - download_live_items(config, arch, "usb-creator") |
| 1290 | + "edubuntu"): |
| 1291 | + download_live_items(config, arch, "usb-creator") |
| 1292 | if project == "ubuntu-core" and config["CDIMAGE_LIVE"]: |
| 1293 | download_live_items(config, arch, "model-assertion") |
| 1294 | |
| 1295 | if not got_image: |
| 1296 | raise NoFilesystemImages("No filesystem images found.") |
| 1297 | |
| 1298 | - if config.project in ("ubuntu-touch", "ubuntu-touch-custom"): |
| 1299 | + if config.project == "ubuntu-touch": |
| 1300 | for arch in config.arches: |
| 1301 | for abootimg in ( |
| 1302 | "boot-%s+%s.img" % (target.ubuntu_arch, target.subarch) |
| 1303 | @@ -1013,7 +883,7 @@ |
| 1304 | ) |
| 1305 | download_live_items(config, arch, "custom.tar.gz") |
| 1306 | |
| 1307 | - if config.project in ("ubuntu-core", "ubuntu-desktop-next"): |
| 1308 | + if config.project == "ubuntu-core": |
| 1309 | for arch in config.arches: |
| 1310 | download_live_items(config, arch, "device.tar.gz") |
| 1311 | |
| 1312 | @@ -1031,12 +901,7 @@ |
| 1313 | if arch == "arm64": |
| 1314 | download_live_items(config, arch, "dragonboard.kernel.snap") |
| 1315 | |
| 1316 | - if (project == "edubuntu" and config["CDIMAGE_INSTALL"] and |
| 1317 | - series <= "hardy"): |
| 1318 | - for cpuarch in config.cpuarches: |
| 1319 | - download_live_items(config, arch, "winfoss") |
| 1320 | - |
| 1321 | - if project == "edubuntu" and config["CDIMAGE_DVD"] and series >= "lucid": |
| 1322 | + if project == "edubuntu" and config["CDIMAGE_DVD"]: |
| 1323 | for arch in config.arches: |
| 1324 | if arch in ("amd64", "i386"): |
| 1325 | # TODO: Disabled for raring (LP: #1154601) |
| 1326 | |
| 1327 | === modified file 'lib/cdimage/project.py' |
| 1328 | --- lib/cdimage/project.py 2017-05-01 02:22:20 +0000 |
| 1329 | +++ lib/cdimage/project.py 2019-02-28 22:59:07 +0000 |
| 1330 | @@ -29,19 +29,13 @@ |
| 1331 | # values of 25 - (length of longest relevant architecture name). |
| 1332 | project_map = { |
| 1333 | "ubuntu": "Ubuntu", |
| 1334 | - "ubuntu-desktop-next": "Ubuntu-Desktop-Next", |
| 1335 | "ubuntu-zh_CN": "Ubuntu Chinese Edition", |
| 1336 | "kubuntu": "Kubuntu", |
| 1337 | "kubuntu-active": "Kubuntu-Active", |
| 1338 | - "kubuntu-plasma5": "Kubuntu-Plasma-5", |
| 1339 | "edubuntu": "Edubuntu", |
| 1340 | "xubuntu": "Xubuntu", |
| 1341 | "gobuntu": "Gobuntu", |
| 1342 | "ubuntu-server": "Ubuntu-Server", |
| 1343 | - "jeos": "Ubuntu-JeOS", |
| 1344 | - "ubuntu-mid": "Ubuntu-MID", |
| 1345 | - "ubuntu-netbook": "Ubuntu-Netbook", |
| 1346 | - "ubuntu-headless": "Ubuntu-Headless", |
| 1347 | "ubuntustudio": "Ubuntu-Studio", |
| 1348 | "mythbuntu": "Mythbuntu", |
| 1349 | "lubuntu": "Lubuntu", |
| 1350 | @@ -50,15 +44,11 @@ |
| 1351 | "ubuntu-gnome": "Ubuntu-GNOME", |
| 1352 | "ubuntu-budgie": "Ubuntu-Budgie", |
| 1353 | "ubuntu-mate": "Ubuntu-MATE", |
| 1354 | - "ubuntu-moblin-remix": "Ubuntu-Moblin-Remix", |
| 1355 | "livecd-base": "LiveCD-Base", |
| 1356 | "ubuntu-core": "Ubuntu Core", |
| 1357 | "ubuntu-base": "Ubuntu-Base", |
| 1358 | "ubuntu-touch-preview": "Ubuntu Touch Preview", |
| 1359 | "ubuntu-touch": "Ubuntu Touch", |
| 1360 | - "ubuntu-touch-custom": "Ubuntu Touch Custom Build", |
| 1361 | - "tocd3": "TheOpenCDv3", |
| 1362 | - "tocd3.1": "TheOpenCDv3.1", |
| 1363 | } |
| 1364 | |
| 1365 | |
| 1366 | |
| 1367 | === modified file 'lib/cdimage/tests/test_build.py' |
| 1368 | --- lib/cdimage/tests/test_build.py 2018-01-09 01:47:28 +0000 |
| 1369 | +++ lib/cdimage/tests/test_build.py 2019-02-28 22:59:07 +0000 |
| 1370 | @@ -74,7 +74,7 @@ |
| 1371 | super(TestUpdateLocalIndices, self).setUp() |
| 1372 | self.config = Config(read=False) |
| 1373 | self.config.root = self.use_temp_dir() |
| 1374 | - self.config["DIST"] = "raring" |
| 1375 | + self.config["DIST"] = "trusty" |
| 1376 | self.config["CPUARCHES"] = "i386" |
| 1377 | self.packages = os.path.join(self.temp_dir, "local", "packages") |
| 1378 | self.database = os.path.join(self.temp_dir, "local", "database") |
| 1379 | @@ -118,45 +118,45 @@ |
| 1380 | expected_command, cwd=self.packages) |
| 1381 | |
| 1382 | self.assertCountEqual([ |
| 1383 | - "raring_local_binary-i386.list", |
| 1384 | - "raring_local_debian-installer_binary-i386.list", |
| 1385 | + "trusty_local_binary-i386.list", |
| 1386 | + "trusty_local_debian-installer_binary-i386.list", |
| 1387 | ], os.listdir(self.dists)) |
| 1388 | with open(os.path.join( |
| 1389 | - self.dists, "raring_local_binary-i386.list")) as f: |
| 1390 | + self.dists, "trusty_local_binary-i386.list")) as f: |
| 1391 | self.assertCountEqual([ |
| 1392 | "pool/local/f/fake/fake_1_i386.deb", |
| 1393 | "pool/local/f/fake/fake-nf_1_all.deb", |
| 1394 | ], f.read().splitlines()) |
| 1395 | with open(os.path.join( |
| 1396 | self.dists, |
| 1397 | - "raring_local_debian-installer_binary-i386.list")) as f: |
| 1398 | + "trusty_local_debian-installer_binary-i386.list")) as f: |
| 1399 | self.assertCountEqual([ |
| 1400 | "pool/local/f/fake/fake-udeb_1_i386.udeb", |
| 1401 | "pool/local/f/fake/fake-udeb-indep_1_all.udeb", |
| 1402 | ], f.read().splitlines()) |
| 1403 | |
| 1404 | self.assertCountEqual([ |
| 1405 | - "override.raring.local.i386", |
| 1406 | - "override.raring.local.debian-installer.i386", |
| 1407 | + "override.trusty.local.i386", |
| 1408 | + "override.trusty.local.debian-installer.i386", |
| 1409 | ], os.listdir(self.indices)) |
| 1410 | with open(os.path.join( |
| 1411 | - self.indices, "override.raring.local.i386")) as f: |
| 1412 | + self.indices, "override.trusty.local.i386")) as f: |
| 1413 | self.assertCountEqual([ |
| 1414 | "fake\toptional\tlocal/misc", |
| 1415 | "fake-nf\textra\tlocal/admin", |
| 1416 | ], f.read().splitlines()) |
| 1417 | with open(os.path.join( |
| 1418 | self.indices, |
| 1419 | - "override.raring.local.debian-installer.i386")) as f: |
| 1420 | + "override.trusty.local.debian-installer.i386")) as f: |
| 1421 | self.assertCountEqual([ |
| 1422 | "fake-udeb\toptional\tlocal/debian-installer", |
| 1423 | "fake-udeb-indep\textra\tlocal/debian-installer", |
| 1424 | ], f.read().splitlines()) |
| 1425 | |
| 1426 | self.assertTrue(os.path.exists(os.path.join( |
| 1427 | - self.packages, "dists", "raring", "local", "binary-i386"))) |
| 1428 | + self.packages, "dists", "trusty", "local", "binary-i386"))) |
| 1429 | self.assertTrue(os.path.exists(os.path.join( |
| 1430 | - self.packages, "dists", "raring", "local", "debian-installer", |
| 1431 | + self.packages, "dists", "trusty", "local", "debian-installer", |
| 1432 | "binary-i386"))) |
| 1433 | |
| 1434 | |
| 1435 | @@ -189,23 +189,23 @@ |
| 1436 | raise osextras.FetchError |
| 1437 | |
| 1438 | mock_fetch.side_effect = fetch_side_effect |
| 1439 | - self.config["DIST"] = "oneiric" |
| 1440 | + self.config["DIST"] = "precise" |
| 1441 | self.config["ARCHES"] = "i386" |
| 1442 | build_ubuntu_defaults_locale(self.config) |
| 1443 | output_dir = os.path.join( |
| 1444 | - self.temp_dir, "scratch", "ubuntu-zh_CN", "oneiric", "daily-live", |
| 1445 | + self.temp_dir, "scratch", "ubuntu-zh_CN", "precise", "daily-live", |
| 1446 | "live") |
| 1447 | self.assertTrue(os.path.isdir(output_dir)) |
| 1448 | self.assertCountEqual([ |
| 1449 | - "oneiric-desktop-i386.iso", |
| 1450 | - "oneiric-desktop-i386.list", |
| 1451 | - "oneiric-desktop-i386.manifest", |
| 1452 | - "oneiric-desktop-i386.manifest-remove", |
| 1453 | - "oneiric-desktop-i386.size", |
| 1454 | + "precise-desktop-i386.iso", |
| 1455 | + "precise-desktop-i386.list", |
| 1456 | + "precise-desktop-i386.manifest", |
| 1457 | + "precise-desktop-i386.manifest-remove", |
| 1458 | + "precise-desktop-i386.size", |
| 1459 | ], os.listdir(output_dir)) |
| 1460 | mock_check_call.assert_called_once_with([ |
| 1461 | os.path.join(self.temp_dir, "debian-cd", "tools", "pi-makelist"), |
| 1462 | - os.path.join(output_dir, "oneiric-desktop-i386.iso"), |
| 1463 | + os.path.join(output_dir, "precise-desktop-i386.iso"), |
| 1464 | ], stdout=mock.ANY) |
| 1465 | |
| 1466 | |
| 1467 | @@ -243,7 +243,7 @@ |
| 1468 | mock_fetch.side_effect = fetch_side_effect |
| 1469 | mock_sign.side_effect = sign_side_effect |
| 1470 | self.config["PROJECT"] = "livecd-base" |
| 1471 | - self.config["DIST"] = "raring" |
| 1472 | + self.config["DIST"] = "trusty" |
| 1473 | self.config["IMAGE_TYPE"] = "livecd-base" |
| 1474 | self.config["ARCHES"] = "i386" |
| 1475 | self.capture_logging() |
| 1476 | @@ -253,7 +253,7 @@ |
| 1477 | self.epoch_date, |
| 1478 | ]) |
| 1479 | live_dir = os.path.join( |
| 1480 | - self.temp_dir, "scratch", "livecd-base", "raring", "livecd-base", |
| 1481 | + self.temp_dir, "scratch", "livecd-base", "trusty", "livecd-base", |
| 1482 | "live") |
| 1483 | self.assertTrue(os.path.isdir(live_dir)) |
| 1484 | self.assertCountEqual( |
| 1485 | @@ -271,7 +271,7 @@ |
| 1486 | |
| 1487 | mock_fetch.side_effect = fetch_side_effect |
| 1488 | self.config["PROJECT"] = "ubuntu-base" |
| 1489 | - self.config["DIST"] = "raring" |
| 1490 | + self.config["DIST"] = "trusty" |
| 1491 | self.config["IMAGE_TYPE"] = "daily" |
| 1492 | self.config["ARCHES"] = "i386" |
| 1493 | self.capture_logging() |
| 1494 | @@ -283,15 +283,15 @@ |
| 1495 | self.epoch_date, |
| 1496 | ]) |
| 1497 | output_dir = os.path.join( |
| 1498 | - self.temp_dir, "scratch", "ubuntu-base", "raring", "daily", |
| 1499 | + self.temp_dir, "scratch", "ubuntu-base", "trusty", "daily", |
| 1500 | "debian-cd", "i386") |
| 1501 | self.assertTrue(os.path.isdir(output_dir)) |
| 1502 | self.assertCountEqual([ |
| 1503 | - "raring-base-i386.manifest", |
| 1504 | - "raring-base-i386.raw", |
| 1505 | - "raring-base-i386.type", |
| 1506 | + "trusty-base-i386.manifest", |
| 1507 | + "trusty-base-i386.raw", |
| 1508 | + "trusty-base-i386.type", |
| 1509 | ], os.listdir(output_dir)) |
| 1510 | - with open(os.path.join(output_dir, "raring-base-i386.type")) as f: |
| 1511 | + with open(os.path.join(output_dir, "trusty-base-i386.type")) as f: |
| 1512 | self.assertEqual("tar archive\n", f.read()) |
| 1513 | |
| 1514 | @mock.patch("cdimage.osextras.fetch") |
| 1515 | @@ -376,7 +376,7 @@ |
| 1516 | mock_fetch.side_effect = fetch_side_effect |
| 1517 | self.config["CDIMAGE_PREINSTALLED"] = "1" |
| 1518 | self.config["PROJECT"] = project |
| 1519 | - self.config["DIST"] = "saucy" |
| 1520 | + self.config["DIST"] = "trusty" |
| 1521 | self.config["IMAGE_TYPE"] = "daily-preinstalled" |
| 1522 | self.config["ARCHES"] = "armhf" |
| 1523 | self.capture_logging() |
| 1524 | @@ -388,34 +388,34 @@ |
| 1525 | self.epoch_date, |
| 1526 | ]) |
| 1527 | output_dir = os.path.join( |
| 1528 | - self.temp_dir, "scratch", project, "saucy", |
| 1529 | + self.temp_dir, "scratch", project, "trusty", |
| 1530 | "daily-preinstalled", "debian-cd", "armhf") |
| 1531 | self.assertTrue(os.path.isdir(output_dir)) |
| 1532 | - touch_files = ["saucy-preinstalled-boot-%s+%s.img" % ( |
| 1533 | + touch_files = ["trusty-preinstalled-boot-%s+%s.img" % ( |
| 1534 | touch_target.ubuntu_arch, touch_target.subarch) |
| 1535 | for touch_target in Touch.list_targets_by_ubuntu_arch("armhf")] |
| 1536 | - touch_files.extend(["saucy-preinstalled-recovery-%s+%s.img" % ( |
| 1537 | + touch_files.extend(["trusty-preinstalled-recovery-%s+%s.img" % ( |
| 1538 | touch_target.android_arch, touch_target.subarch) |
| 1539 | for touch_target in Touch.list_targets_by_ubuntu_arch("armhf")]) |
| 1540 | - touch_files.extend(["saucy-preinstalled-system-%s+%s.img" % ( |
| 1541 | + touch_files.extend(["trusty-preinstalled-system-%s+%s.img" % ( |
| 1542 | touch_target.android_arch, touch_target.subarch) |
| 1543 | for touch_target in Touch.list_targets_by_ubuntu_arch("armhf")]) |
| 1544 | touch_files.extend([ |
| 1545 | - "saucy-preinstalled-touch-armhf.manifest", |
| 1546 | - "saucy-preinstalled-touch-armhf.raw", |
| 1547 | - "saucy-preinstalled-touch-armhf.type", |
| 1548 | - "saucy-preinstalled-touch-armhf.tar.gz", |
| 1549 | - "saucy-preinstalled-touch-armhf.custom.tar.gz", |
| 1550 | + "trusty-preinstalled-touch-armhf.manifest", |
| 1551 | + "trusty-preinstalled-touch-armhf.raw", |
| 1552 | + "trusty-preinstalled-touch-armhf.type", |
| 1553 | + "trusty-preinstalled-touch-armhf.tar.gz", |
| 1554 | + "trusty-preinstalled-touch-armhf.custom.tar.gz", |
| 1555 | ]) |
| 1556 | self.assertCountEqual(touch_files, os.listdir(output_dir)) |
| 1557 | with open(os.path.join( |
| 1558 | - output_dir, "saucy-preinstalled-touch-armhf.type") |
| 1559 | + output_dir, "trusty-preinstalled-touch-armhf.type") |
| 1560 | ) as f: |
| 1561 | self.assertEqual("tar archive\n", f.read()) |
| 1562 | for touch_target in Touch.list_targets_by_ubuntu_arch("armhf"): |
| 1563 | - system_img = "saucy-preinstalled-system-%s+%s.img" % ( |
| 1564 | + system_img = "trusty-preinstalled-system-%s+%s.img" % ( |
| 1565 | touch_target.android_arch, touch_target.subarch) |
| 1566 | - recovery_img = "saucy-preinstalled-recovery-%s+%s.img" % ( |
| 1567 | + recovery_img = "trusty-preinstalled-recovery-%s+%s.img" % ( |
| 1568 | touch_target.android_arch, touch_target.subarch) |
| 1569 | self.assertTrue(os.path.exists( |
| 1570 | os.path.join(output_dir, system_img))) |
| 1571 | @@ -425,41 +425,6 @@ |
| 1572 | def test_ubuntu_touch(self): |
| 1573 | self._perform_ubuntu_touch_testing("ubuntu-touch") |
| 1574 | |
| 1575 | - def test_ubuntu_touch_custom(self): |
| 1576 | - self._perform_ubuntu_touch_testing("ubuntu-touch-custom") |
| 1577 | - |
| 1578 | - @mock.patch("cdimage.osextras.fetch") |
| 1579 | - def test_ubuntu_desktop_next_system_image(self, mock_fetch): |
| 1580 | - def fetch_side_effect(config, source, target): |
| 1581 | - if (target.endswith(".manifest") or |
| 1582 | - target.endswith(".rootfs.tar.gz")): |
| 1583 | - touch(target) |
| 1584 | - else: |
| 1585 | - raise osextras.FetchError |
| 1586 | - |
| 1587 | - mock_fetch.side_effect = fetch_side_effect |
| 1588 | - self.config["PROJECT"] = "ubuntu-desktop-next" |
| 1589 | - self.config["SUBPROJECT"] = "system-image" |
| 1590 | - self.config["DIST"] = "utopic" |
| 1591 | - self.config["IMAGE_TYPE"] = "daily" |
| 1592 | - self.config["ARCHES"] = "i386" |
| 1593 | - self.capture_logging() |
| 1594 | - build_livecd_base(self.config) |
| 1595 | - self.assertLogEqual([ |
| 1596 | - "===== Downloading live filesystem images =====", |
| 1597 | - self.epoch_date, |
| 1598 | - "===== Copying images to debian-cd output directory =====", |
| 1599 | - self.epoch_date, |
| 1600 | - ]) |
| 1601 | - output_dir = os.path.join( |
| 1602 | - self.temp_dir, "scratch", "ubuntu-desktop-next", "utopic", "daily", |
| 1603 | - "live") |
| 1604 | - self.assertTrue(os.path.isdir(output_dir)) |
| 1605 | - self.assertCountEqual([ |
| 1606 | - "i386.manifest", |
| 1607 | - "i386.rootfs.tar.gz", |
| 1608 | - ], os.listdir(output_dir)) |
| 1609 | - |
| 1610 | |
| 1611 | class TestExtractDebootstrap(TestCase): |
| 1612 | def setUp(self): |
| 1613 | @@ -469,27 +434,27 @@ |
| 1614 | |
| 1615 | def test_debootstrap_script(self): |
| 1616 | for series, script in ( |
| 1617 | - ("gutsy", "usr/lib/debootstrap/scripts/gutsy"), |
| 1618 | - ("hardy", "usr/share/debootstrap/scripts/hardy"), |
| 1619 | + ("precise", "usr/share/debootstrap/scripts/precise"), |
| 1620 | + ("bionic", "usr/share/debootstrap/scripts/bionic"), |
| 1621 | ): |
| 1622 | self.config["DIST"] = series |
| 1623 | self.assertEqual(script, _debootstrap_script(self.config)) |
| 1624 | |
| 1625 | def test_extract_debootstrap(self): |
| 1626 | self.config["PROJECT"] = "ubuntu" |
| 1627 | - self.config["DIST"] = "raring" |
| 1628 | + self.config["DIST"] = "trusty" |
| 1629 | self.config["IMAGE_TYPE"] = "daily" |
| 1630 | self.config["ARCHES"] = "amd64+mac" |
| 1631 | mirror_dir = os.path.join(self.temp_dir, "ftp") |
| 1632 | packages_path = os.path.join( |
| 1633 | - mirror_dir, "dists", "raring", "main", "debian-installer", |
| 1634 | + mirror_dir, "dists", "trusty", "main", "debian-installer", |
| 1635 | "binary-amd64", "Packages.gz") |
| 1636 | udeb_path = os.path.join( |
| 1637 | mirror_dir, "pool", "main", "d", "debootstrap", |
| 1638 | "debootstrap-udeb_1_all.udeb") |
| 1639 | self.make_deb( |
| 1640 | udeb_path, "debian-installer", "extra", |
| 1641 | - files={"/usr/share/debootstrap/scripts/raring": b"sentinel"}) |
| 1642 | + files={"/usr/share/debootstrap/scripts/trusty": b"sentinel"}) |
| 1643 | os.makedirs(os.path.dirname(packages_path)) |
| 1644 | with gzip.GzipFile(packages_path, "wb") as packages: |
| 1645 | ftparchive = subprocess.Popen( |
| 1646 | @@ -500,8 +465,8 @@ |
| 1647 | self.assertEqual(0, ftparchive.returncode) |
| 1648 | extract_debootstrap(self.config) |
| 1649 | output_path = os.path.join( |
| 1650 | - self.temp_dir, "scratch", "ubuntu", "raring", "daily", |
| 1651 | - "debootstrap", "raring-amd64+mac") |
| 1652 | + self.temp_dir, "scratch", "ubuntu", "trusty", "daily", |
| 1653 | + "debootstrap", "trusty-amd64+mac") |
| 1654 | self.assertTrue(os.path.exists(output_path)) |
| 1655 | with open(output_path, "rb") as output: |
| 1656 | self.assertEqual(b"sentinel", output.read()) |
| 1657 | @@ -523,10 +488,10 @@ |
| 1658 | @mock.patch("cdimage.osextras.unlink_force") |
| 1659 | def test_lock_build_image_set(self, mock_unlink_force, mock_check_call): |
| 1660 | self.config["PROJECT"] = "ubuntu" |
| 1661 | - self.config["DIST"] = "raring" |
| 1662 | + self.config["DIST"] = "trusty" |
| 1663 | self.config["IMAGE_TYPE"] = "daily" |
| 1664 | expected_lock_path = os.path.join( |
| 1665 | - self.temp_dir, "etc", ".lock-build-image-set-ubuntu-raring-daily") |
| 1666 | + self.temp_dir, "etc", ".lock-build-image-set-ubuntu-trusty-daily") |
| 1667 | self.assertFalse(os.path.exists(expected_lock_path)) |
| 1668 | with lock_build_image_set(self.config): |
| 1669 | mock_check_call.assert_called_once_with([ |
| 1670 | @@ -539,12 +504,12 @@ |
| 1671 | def test_lock_build_image_set_chinese(self, mock_unlink_force, |
| 1672 | mock_check_call): |
| 1673 | self.config["PROJECT"] = "ubuntu" |
| 1674 | - self.config["DIST"] = "raring" |
| 1675 | + self.config["DIST"] = "trusty" |
| 1676 | self.config["IMAGE_TYPE"] = "daily" |
| 1677 | self.config["UBUNTU_DEFAULTS_LOCALE"] = "zh_CN" |
| 1678 | expected_lock_path = os.path.join( |
| 1679 | self.temp_dir, "etc", |
| 1680 | - ".lock-build-image-set-ubuntu-chinese-edition-raring-daily") |
| 1681 | + ".lock-build-image-set-ubuntu-chinese-edition-trusty-daily") |
| 1682 | self.assertFalse(os.path.exists(expected_lock_path)) |
| 1683 | with lock_build_image_set(self.config): |
| 1684 | mock_check_call.assert_called_once_with([ |
| 1685 | @@ -554,25 +519,20 @@ |
| 1686 | |
| 1687 | def test_configure_onlyfree_unsupported(self): |
| 1688 | for project, series, onlyfree, unsupported in ( |
| 1689 | - ("ubuntu", "raring", False, False), |
| 1690 | + ("ubuntu", "trusty", False, False), |
| 1691 | ("gobuntu", "hardy", True, False), |
| 1692 | - ("edubuntu", "jaunty", False, False), |
| 1693 | - ("edubuntu", "karmic", False, True), |
| 1694 | - ("xubuntu", "gutsy", False, False), |
| 1695 | - ("xubuntu", "hardy", False, True), |
| 1696 | + ("edubuntu", "precise", False, True), |
| 1697 | + ("xubuntu", "precise", False, True), |
| 1698 | ("kubuntu", "precise", False, False), |
| 1699 | - ("kubuntu", "quantal", False, True), |
| 1700 | - ("kubuntu-active", "raring", False, True), |
| 1701 | - ("kubuntu-plasma5", "utopic", False, True), |
| 1702 | - ("ubuntustudio", "raring", False, True), |
| 1703 | - ("mythbuntu", "raring", False, True), |
| 1704 | - ("lubuntu", "raring", False, True), |
| 1705 | - ("ubuntukylin", "raring", False, True), |
| 1706 | - ("ubuntu-gnome", "raring", False, True), |
| 1707 | - ("ubuntu-budgie", "zesty", False, True), |
| 1708 | - ("ubuntu-mate", "vivid", False, True), |
| 1709 | - ("ubuntu-moblin-remix", "raring", False, True), |
| 1710 | - ("ubuntu-desktop-next", "utopic", False, False), |
| 1711 | + ("kubuntu", "trusty", False, True), |
| 1712 | + ("kubuntu-active", "trusty", False, True), |
| 1713 | + ("ubuntustudio", "trusty", False, True), |
| 1714 | + ("mythbuntu", "trusty", False, True), |
| 1715 | + ("lubuntu", "trusty", False, True), |
| 1716 | + ("ubuntukylin", "trusty", False, True), |
| 1717 | + ("ubuntu-gnome", "trusty", False, True), |
| 1718 | + ("ubuntu-budgie", "bionic", False, True), |
| 1719 | + ("ubuntu-mate", "xenial", False, True), |
| 1720 | ): |
| 1721 | config = Config(read=False) |
| 1722 | config["PROJECT"] = project |
| 1723 | @@ -605,7 +565,7 @@ |
| 1724 | |
| 1725 | def test_open_log_writes_log(self): |
| 1726 | self.config["PROJECT"] = "ubuntu" |
| 1727 | - self.config["DIST"] = "raring" |
| 1728 | + self.config["DIST"] = "trusty" |
| 1729 | self.config["IMAGE_TYPE"] = "daily" |
| 1730 | self.config["CDIMAGE_DATE"] = "20130224" |
| 1731 | pid = os.fork() |
| 1732 | @@ -620,7 +580,7 @@ |
| 1733 | else: # parent |
| 1734 | self.wait_for_pid(pid, 0) |
| 1735 | expected_log_path = os.path.join( |
| 1736 | - self.temp_dir, "log", "ubuntu", "raring", "daily-20130224.log") |
| 1737 | + self.temp_dir, "log", "ubuntu", "trusty", "daily-20130224.log") |
| 1738 | self.assertTrue(os.path.exists(expected_log_path)) |
| 1739 | with open(expected_log_path) as log: |
| 1740 | self.assertEqual([ |
| 1741 | @@ -631,7 +591,7 @@ |
| 1742 | |
| 1743 | def test_open_log_chinese(self): |
| 1744 | self.config["PROJECT"] = "ubuntu" |
| 1745 | - self.config["DIST"] = "raring" |
| 1746 | + self.config["DIST"] = "trusty" |
| 1747 | self.config["IMAGE_TYPE"] = "daily" |
| 1748 | self.config["UBUNTU_DEFAULTS_LOCALE"] = "zh_CN" |
| 1749 | self.config["CDIMAGE_DATE"] = "20130224" |
| 1750 | @@ -647,7 +607,7 @@ |
| 1751 | else: # parent |
| 1752 | self.wait_for_pid(pid, 0) |
| 1753 | expected_log_path = os.path.join( |
| 1754 | - self.temp_dir, "log", "ubuntu-chinese-edition", "raring", |
| 1755 | + self.temp_dir, "log", "ubuntu-chinese-edition", "trusty", |
| 1756 | "daily-20130224.log") |
| 1757 | self.assertTrue(os.path.exists(expected_log_path)) |
| 1758 | with open(expected_log_path) as log: |
| 1759 | @@ -880,7 +840,7 @@ |
| 1760 | ["make", "-C", os.path.dirname(path)]) |
| 1761 | |
| 1762 | def test_configure_splash(self): |
| 1763 | - data_dir = os.path.join(self.temp_dir, "debian-cd", "data", "raring") |
| 1764 | + data_dir = os.path.join(self.temp_dir, "debian-cd", "data", "trusty") |
| 1765 | for key, extension in ( |
| 1766 | ("SPLASHRLE", "rle"), |
| 1767 | ("GFXSPLASH", "pcx"), |
| 1768 | @@ -890,7 +850,7 @@ |
| 1769 | config = Config(read=False) |
| 1770 | config.root = self.temp_dir |
| 1771 | config["PROJECT"] = "kubuntu" |
| 1772 | - config["DIST"] = "raring" |
| 1773 | + config["DIST"] = "trusty" |
| 1774 | path = os.path.join( |
| 1775 | data_dir, "%s.%s" % ( |
| 1776 | "kubuntu" if project_specific else "splash", |
| 1777 | @@ -941,10 +901,10 @@ |
| 1778 | |
| 1779 | def test_fix_permissions(self): |
| 1780 | self.config["PROJECT"] = "ubuntu" |
| 1781 | - self.config["DIST"] = "raring" |
| 1782 | + self.config["DIST"] = "trusty" |
| 1783 | self.config["IMAGE_TYPE"] = "daily" |
| 1784 | scratch_dir = os.path.join( |
| 1785 | - self.temp_dir, "scratch", "ubuntu", "raring", "daily") |
| 1786 | + self.temp_dir, "scratch", "ubuntu", "trusty", "daily") |
| 1787 | subdir = os.path.join(scratch_dir, "x") |
| 1788 | dir_one = os.path.join(subdir, "1") |
| 1789 | file_two = os.path.join(subdir, "2") |
| 1790 | @@ -978,14 +938,14 @@ |
| 1791 | |
| 1792 | @mock.patch("cdimage.build.send_mail") |
| 1793 | def test_notify_failure_no_recipients(self, mock_send_mail): |
| 1794 | - self.config["DIST"] = "raring" |
| 1795 | + self.config["DIST"] = "trusty" |
| 1796 | notify_failure(self.config, None) |
| 1797 | self.assertEqual(0, mock_send_mail.call_count) |
| 1798 | |
| 1799 | @mock.patch("cdimage.build.send_mail") |
| 1800 | def test_notify_failure_no_log(self, mock_send_mail): |
| 1801 | self.config["PROJECT"] = "ubuntu" |
| 1802 | - self.config["DIST"] = "raring" |
| 1803 | + self.config["DIST"] = "trusty" |
| 1804 | self.config["IMAGE_TYPE"] = "daily" |
| 1805 | self.config["CDIMAGE_DATE"] = "20130225" |
| 1806 | path = os.path.join(self.temp_dir, "production", "notify-addresses") |
| 1807 | @@ -993,13 +953,13 @@ |
| 1808 | print("ALL\tfoo@example.org", file=notify_addresses) |
| 1809 | notify_failure(self.config, None) |
| 1810 | mock_send_mail.assert_called_once_with( |
| 1811 | - "CD image ubuntu/raring/daily failed to build on 20130225", |
| 1812 | + "CD image ubuntu/trusty/daily failed to build on 20130225", |
| 1813 | "build-image-set", ["foo@example.org"], "") |
| 1814 | |
| 1815 | @mock.patch("cdimage.build.send_mail") |
| 1816 | def test_notify_failure_log(self, mock_send_mail): |
| 1817 | self.config["PROJECT"] = "ubuntu" |
| 1818 | - self.config["DIST"] = "raring" |
| 1819 | + self.config["DIST"] = "trusty" |
| 1820 | self.config["IMAGE_TYPE"] = "daily" |
| 1821 | self.config["CDIMAGE_DATE"] = "20130225" |
| 1822 | path = os.path.join(self.temp_dir, "production", "notify-addresses") |
| 1823 | @@ -1010,14 +970,14 @@ |
| 1824 | print("Log", file=log) |
| 1825 | notify_failure(self.config, log_path) |
| 1826 | mock_send_mail.assert_called_once_with( |
| 1827 | - "CD image ubuntu/raring/daily failed to build on 20130225", |
| 1828 | + "CD image ubuntu/trusty/daily failed to build on 20130225", |
| 1829 | "build-image-set", ["foo@example.org"], mock.ANY) |
| 1830 | self.assertEqual(log_path, mock_send_mail.call_args[0][3].name) |
| 1831 | |
| 1832 | @mock.patch("cdimage.build.send_mail") |
| 1833 | def test_notify_failure_chinese(self, mock_send_mail): |
| 1834 | self.config["PROJECT"] = "ubuntu" |
| 1835 | - self.config["DIST"] = "raring" |
| 1836 | + self.config["DIST"] = "trusty" |
| 1837 | self.config["IMAGE_TYPE"] = "daily" |
| 1838 | self.config["UBUNTU_DEFAULTS_LOCALE"] = "zh_CN" |
| 1839 | self.config["CDIMAGE_DATE"] = "20130225" |
| 1840 | @@ -1029,7 +989,7 @@ |
| 1841 | print("Log", file=log) |
| 1842 | notify_failure(self.config, log_path) |
| 1843 | mock_send_mail.assert_called_once_with( |
| 1844 | - "CD image ubuntu-chinese-edition/raring/daily failed to build on " |
| 1845 | + "CD image ubuntu-chinese-edition/trusty/daily failed to build on " |
| 1846 | "20130225", |
| 1847 | "build-image-set", ["foo@example.org"], mock.ANY) |
| 1848 | self.assertEqual(log_path, mock_send_mail.call_args[0][3].name) |
| 1849 | @@ -1055,14 +1015,14 @@ |
| 1850 | def test_build_image_set_locked_notifies_on_failure( |
| 1851 | self, mock_send_mail, mock_sync_local_mirror, *args): |
| 1852 | self.config["PROJECT"] = "ubuntu" |
| 1853 | - self.config["DIST"] = "raring" |
| 1854 | + self.config["DIST"] = "trusty" |
| 1855 | self.config["IMAGE_TYPE"] = "daily" |
| 1856 | self.config["CDIMAGE_DATE"] = "20130225" |
| 1857 | path = os.path.join(self.temp_dir, "production", "notify-addresses") |
| 1858 | with mkfile(path, "w") as notify_addresses: |
| 1859 | print("ALL\tfoo@example.org", file=notify_addresses) |
| 1860 | log_path = os.path.join( |
| 1861 | - self.temp_dir, "log", "ubuntu", "raring", "daily-20130225.log") |
| 1862 | + self.temp_dir, "log", "ubuntu", "trusty", "daily-20130225.log") |
| 1863 | os.makedirs(os.path.join(self.temp_dir, "etc")) |
| 1864 | |
| 1865 | def force_failure(*args): |
| 1866 | @@ -1113,7 +1073,7 @@ |
| 1867 | mock_tracker_set_rebuild_status, mock_call): |
| 1868 | self.config["PROJECT"] = "ubuntu" |
| 1869 | self.config["CAPPROJECT"] = "Ubuntu" |
| 1870 | - self.config["DIST"] = "raring" |
| 1871 | + self.config["DIST"] = "trusty" |
| 1872 | self.config["IMAGE_TYPE"] = "daily" |
| 1873 | self.config["ARCHES"] = "amd64 i386" |
| 1874 | self.config["CPUARCHES"] = "amd64 i386" |
| 1875 | @@ -1127,8 +1087,8 @@ |
| 1876 | touch(germinate_path) |
| 1877 | os.chmod(germinate_path, 0o755) |
| 1878 | germinate_output = os.path.join( |
| 1879 | - self.temp_dir, "scratch", "ubuntu", "raring", "daily", "germinate") |
| 1880 | - log_dir = os.path.join(self.temp_dir, "log", "ubuntu", "raring") |
| 1881 | + self.temp_dir, "scratch", "ubuntu", "trusty", "daily", "germinate") |
| 1882 | + log_dir = os.path.join(self.temp_dir, "log", "ubuntu", "trusty") |
| 1883 | |
| 1884 | def side_effect(command, *args, **kwargs): |
| 1885 | if command[0] == germinate_path: |
| 1886 | @@ -1150,8 +1110,8 @@ |
| 1887 | germinate_path, |
| 1888 | "--seed-source", mock.ANY, |
| 1889 | "--mirror", "file://%s/" % germinate_output, |
| 1890 | - "--seed-dist", "ubuntu.raring", |
| 1891 | - "--dist", "raring,raring-security,raring-updates", |
| 1892 | + "--seed-dist", "ubuntu.trusty", |
| 1893 | + "--dist", "trusty,trusty-security,trusty-updates", |
| 1894 | "--arch", arch, |
| 1895 | "--components", "main", |
| 1896 | "--no-rdepends", |
| 1897 | @@ -1204,8 +1164,8 @@ |
| 1898 | DATE |
| 1899 | ===== Germinating ===== |
| 1900 | DATE |
| 1901 | - Germinating for raring/amd64 ... |
| 1902 | - Germinating for raring/i386 ... |
| 1903 | + Germinating for trusty/amd64 ... |
| 1904 | + Germinating for trusty/i386 ... |
| 1905 | ===== Generating new task lists ===== |
| 1906 | DATE |
| 1907 | ===== Checking for other task changes ===== |
| 1908 | @@ -1226,10 +1186,10 @@ |
| 1909 | "cdimage.build.build_image_set_locked", side_effect=KeyboardInterrupt) |
| 1910 | def test_build_image_set_interrupted(self, *args): |
| 1911 | self.config["PROJECT"] = "ubuntu" |
| 1912 | - self.config["DIST"] = "raring" |
| 1913 | + self.config["DIST"] = "trusty" |
| 1914 | self.config["IMAGE_TYPE"] = "daily" |
| 1915 | lock_path = os.path.join( |
| 1916 | - self.temp_dir, "etc", ".lock-build-image-set-ubuntu-raring-daily") |
| 1917 | + self.temp_dir, "etc", ".lock-build-image-set-ubuntu-trusty-daily") |
| 1918 | multipidfile_path = os.path.join( |
| 1919 | self.temp_dir, "etc", ".build-image-set-pids") |
| 1920 | os.makedirs(os.path.dirname(lock_path)) |
| 1921 | @@ -1241,10 +1201,10 @@ |
| 1922 | @mock.patch("cdimage.build.build_image_set_locked") |
| 1923 | def test_build_image_set_terminated(self, mock_build_image_set_locked): |
| 1924 | self.config["PROJECT"] = "ubuntu" |
| 1925 | - self.config["DIST"] = "raring" |
| 1926 | + self.config["DIST"] = "trusty" |
| 1927 | self.config["IMAGE_TYPE"] = "daily" |
| 1928 | lock_path = os.path.join( |
| 1929 | - self.temp_dir, "etc", ".lock-build-image-set-ubuntu-raring-daily") |
| 1930 | + self.temp_dir, "etc", ".lock-build-image-set-ubuntu-trusty-daily") |
| 1931 | multipidfile_path = os.path.join( |
| 1932 | self.temp_dir, "etc", ".build-image-set-pids") |
| 1933 | os.makedirs(os.path.dirname(lock_path)) |
| 1934 | @@ -1264,10 +1224,10 @@ |
| 1935 | @mock.patch("cdimage.build.build_image_set_locked") |
| 1936 | def test_build_image_set(self, mock_build_image_set_locked): |
| 1937 | self.config["PROJECT"] = "ubuntu" |
| 1938 | - self.config["DIST"] = "raring" |
| 1939 | + self.config["DIST"] = "trusty" |
| 1940 | self.config["IMAGE_TYPE"] = "daily" |
| 1941 | lock_path = os.path.join( |
| 1942 | - self.temp_dir, "etc", ".lock-build-image-set-ubuntu-raring-daily") |
| 1943 | + self.temp_dir, "etc", ".lock-build-image-set-ubuntu-trusty-daily") |
| 1944 | multipidfile_path = os.path.join( |
| 1945 | self.temp_dir, "etc", ".build-image-set-pids") |
| 1946 | os.makedirs(os.path.dirname(lock_path)) |
| 1947 | |
| 1948 | === modified file 'lib/cdimage/tests/test_build_id.py' |
| 1949 | --- lib/cdimage/tests/test_build_id.py 2014-07-17 17:12:16 +0000 |
| 1950 | +++ lib/cdimage/tests/test_build_id.py 2019-02-28 22:59:07 +0000 |
| 1951 | @@ -66,12 +66,12 @@ |
| 1952 | config = Config(read=False) |
| 1953 | config.root = self.use_temp_dir() |
| 1954 | config["PROJECT"] = "ubuntu" |
| 1955 | - config["DIST"] = "raring" |
| 1956 | + config["DIST"] = "trusty" |
| 1957 | config["UBUNTU_DEFAULTS_LOCALE"] = "zh_CN" |
| 1958 | os.mkdir(os.path.join(self.temp_dir, "etc")) |
| 1959 | stamp = os.path.join( |
| 1960 | config.root, "etc", |
| 1961 | - ".next-build-suffix-ubuntu-chinese-edition-raring-daily") |
| 1962 | + ".next-build-suffix-ubuntu-chinese-edition-trusty-daily") |
| 1963 | self.assertFalse(os.path.exists(stamp)) |
| 1964 | self.assertEqual("20130225", next_build_id(config, "")) |
| 1965 | with open(stamp) as stamp_file: |
| 1966 | |
| 1967 | === modified file 'lib/cdimage/tests/test_check_installable.py' |
| 1968 | --- lib/cdimage/tests/test_check_installable.py 2017-08-27 06:42:48 +0000 |
| 1969 | +++ lib/cdimage/tests/test_check_installable.py 2019-02-28 22:59:07 +0000 |
| 1970 | @@ -41,7 +41,7 @@ |
| 1971 | self.config["PROJECT"] = "ubuntu" |
| 1972 | self.config["CAPPROJECT"] = "Ubuntu" |
| 1973 | self.config["IMAGE_TYPE"] = "daily" |
| 1974 | - self.config["DIST"] = "warty" |
| 1975 | + self.config["DIST"] = "precise" |
| 1976 | self.config["ARCHES"] = "i386" |
| 1977 | |
| 1978 | def test_dirs(self): |
| 1979 | @@ -49,29 +49,29 @@ |
| 1980 | self.assertEqual(os.path.join(self.config.root, "britney"), britney) |
| 1981 | self.assertEqual( |
| 1982 | os.path.join( |
| 1983 | - self.config.root, "scratch", "ubuntu", "warty", "daily", |
| 1984 | + self.config.root, "scratch", "ubuntu", "precise", "daily", |
| 1985 | "tmp"), |
| 1986 | image_top) |
| 1987 | self.assertEqual( |
| 1988 | os.path.join( |
| 1989 | - self.config.root, "scratch", "ubuntu", "warty", "daily", |
| 1990 | + self.config.root, "scratch", "ubuntu", "precise", "daily", |
| 1991 | "live"), |
| 1992 | live) |
| 1993 | self.assertEqual( |
| 1994 | - os.path.join(britney, "data", "ubuntu", "daily", "warty"), data) |
| 1995 | + os.path.join(britney, "data", "ubuntu", "daily", "precise"), data) |
| 1996 | |
| 1997 | def test_prepare_no_packages(self): |
| 1998 | _, _, _, data = _check_installable_dirs(self.config) |
| 1999 | self.capture_logging() |
| 2000 | _prepare_check_installable(self.config) |
| 2001 | - self.assertLogEqual(["No Packages.gz for warty/i386; not checking"]) |
| 2002 | + self.assertLogEqual(["No Packages.gz for precise/i386; not checking"]) |
| 2003 | self.assertEqual(["Sources"], os.listdir(data)) |
| 2004 | self.assertEqual(0, os.stat(os.path.join(data, "Sources")).st_size) |
| 2005 | |
| 2006 | def test_prepare_with_packages(self): |
| 2007 | _, image_top, _, data = _check_installable_dirs(self.config) |
| 2008 | packages_gz = os.path.join( |
| 2009 | - image_top, "warty-i386", "CD1", "dists", "warty", "main", |
| 2010 | + image_top, "precise-i386", "CD1", "dists", "precise", "main", |
| 2011 | "binary-i386", "Packages.gz") |
| 2012 | os.makedirs(os.path.dirname(packages_gz)) |
| 2013 | packages_gz_file = gzip.open(packages_gz, "wb") |
| 2014 | @@ -125,5 +125,5 @@ |
| 2015 | "timeout", "30", |
| 2016 | os.path.join(britney, "rptprobs.sh"), data, |
| 2017 | os.path.join( |
| 2018 | - britney, "report", "ubuntu", "daily", "warty_probs.html"), |
| 2019 | - "Ubuntu warty"], command) |
| 2020 | + britney, "report", "ubuntu", "daily", "precise_probs.html"), |
| 2021 | + "Ubuntu precise"], command) |
| 2022 | |
| 2023 | === modified file 'lib/cdimage/tests/test_config.py' |
| 2024 | --- lib/cdimage/tests/test_config.py 2018-10-30 13:23:58 +0000 |
| 2025 | +++ lib/cdimage/tests/test_config.py 2019-02-28 22:59:07 +0000 |
| 2026 | @@ -295,12 +295,6 @@ |
| 2027 | self.assertEqual(None, config.core_series) |
| 2028 | config["DIST"] = "xenial" |
| 2029 | self.assertEqual("16", config.core_series) |
| 2030 | - config["DIST"] = "yakkety" |
| 2031 | - self.assertEqual("16", config.core_series) |
| 2032 | - config["DIST"] = "zesty" |
| 2033 | - self.assertEqual("16", config.core_series) |
| 2034 | - config["DIST"] = "artful" |
| 2035 | - self.assertEqual("16", config.core_series) |
| 2036 | config["DIST"] = "bionic" |
| 2037 | self.assertEqual("18", config.core_series) |
| 2038 | config["DIST"] = "cosmic" |
| 2039 | |
| 2040 | === modified file 'lib/cdimage/tests/test_germinate.py' |
| 2041 | --- lib/cdimage/tests/test_germinate.py 2019-02-22 10:32:26 +0000 |
| 2042 | +++ lib/cdimage/tests/test_germinate.py 2019-02-28 22:59:07 +0000 |
| 2043 | @@ -68,10 +68,10 @@ |
| 2044 | |
| 2045 | def test_output_dir(self): |
| 2046 | self.config.root = "/cdimage" |
| 2047 | - self.config["DIST"] = "raring" |
| 2048 | + self.config["DIST"] = "bionic" |
| 2049 | self.config["IMAGE_TYPE"] = "daily" |
| 2050 | self.assertEqual( |
| 2051 | - "/cdimage/scratch/ubuntu/raring/daily/germinate", |
| 2052 | + "/cdimage/scratch/ubuntu/bionic/daily/germinate", |
| 2053 | self.germination.output_dir("ubuntu")) |
| 2054 | |
| 2055 | def test_seed_sources_local_seeds(self): |
| 2056 | @@ -82,18 +82,11 @@ |
| 2057 | |
| 2058 | def test_seed_sources_bzr(self): |
| 2059 | for project, series, owners in ( |
| 2060 | - ("kubuntu", "natty", ["ubuntu-core-dev"]), |
| 2061 | - ("kubuntu", "oneiric", ["kubuntu-dev"]), |
| 2062 | - ("kubuntu-active", "natty", ["ubuntu-core-dev"]), |
| 2063 | - ("kubuntu-active", "oneiric", ["kubuntu-dev"]), |
| 2064 | - ("kubuntu-plasma5", "utopic", ["kubuntu-dev"]), |
| 2065 | - ("mythbuntu", "raring", ["mythbuntu-dev"]), |
| 2066 | - ("xubuntu", "hardy", ["ubuntu-core-dev"]), |
| 2067 | - ("ubuntu-budgie", "zesty", |
| 2068 | - ["ubuntubudgie-dev"]), |
| 2069 | - ("ubuntu-mate", "vivid", |
| 2070 | - ["ubuntu-mate-dev"]), |
| 2071 | - ("ubuntu-moblin-remix", "hardy", ["moblin"]), |
| 2072 | + ("kubuntu", "precise", ["kubuntu-dev"]), |
| 2073 | + ("kubuntu-active", "precise", ["kubuntu-dev"]), |
| 2074 | + ("mythbuntu", "trusty", ["mythbuntu-dev"]), |
| 2075 | + ("ubuntu-budgie", "bionic", ["ubuntubudgie-dev"]), |
| 2076 | + ("ubuntu-mate", "xenial", ["ubuntu-mate-dev"]), |
| 2077 | ("ubuntukylin", "trusty", ["ubuntu-core-dev"]), |
| 2078 | ): |
| 2079 | self.config["DIST"] = series |
| 2080 | @@ -106,14 +99,14 @@ |
| 2081 | self.assertEqual(sources, self.germination.seed_sources(project)) |
| 2082 | |
| 2083 | for project, series, owners in ( |
| 2084 | - ("ubuntu", "raring", ["ubuntu-core-dev"]), |
| 2085 | - ("lubuntu", "raring", ["lubuntu-dev", "ubuntu-core-dev"]), |
| 2086 | - ("xubuntu", "intrepid", ["xubuntu-dev", "ubuntu-core-dev"]), |
| 2087 | - ("ubuntu-gnome", "raring", |
| 2088 | + ("ubuntu", "trusty", ["ubuntu-core-dev"]), |
| 2089 | + ("lubuntu", "trusty", ["lubuntu-dev", "ubuntu-core-dev"]), |
| 2090 | + ("xubuntu", "precise", ["xubuntu-dev", "ubuntu-core-dev"]), |
| 2091 | + ("ubuntu-gnome", "trusty", |
| 2092 | ["ubuntu-gnome-dev", "ubuntu-core-dev"]), |
| 2093 | - ("ubuntukylin", "utopic", |
| 2094 | + ("ubuntukylin", "xenial", |
| 2095 | ["ubuntukylin-members", "ubuntu-core-dev"]), |
| 2096 | - ("ubuntustudio", "raring", |
| 2097 | + ("ubuntustudio", "trusty", |
| 2098 | ["ubuntustudio-dev", "ubuntu-core-dev"]), |
| 2099 | ): |
| 2100 | self.config["DIST"] = series |
| 2101 | @@ -124,7 +117,7 @@ |
| 2102 | |
| 2103 | def test_seed_sources_non_bzr(self): |
| 2104 | self.germination = Germination(self.config, prefer_vcs=False) |
| 2105 | - self.config["DIST"] = "raring" |
| 2106 | + self.config["DIST"] = "trusty" |
| 2107 | self.assertEqual( |
| 2108 | ["http://people.canonical.com/~ubuntu-archive/seeds/"], |
| 2109 | self.germination.seed_sources("ubuntu")) |
| 2110 | @@ -141,22 +134,22 @@ |
| 2111 | |
| 2112 | def test_make_index(self): |
| 2113 | self.config.root = self.use_temp_dir() |
| 2114 | - self.config["DIST"] = "raring" |
| 2115 | + self.config["DIST"] = "trusty" |
| 2116 | self.config["IMAGE_TYPE"] = "daily" |
| 2117 | files = [] |
| 2118 | for component in "main", "restricted", "universe", "multiverse": |
| 2119 | source_dir = os.path.join( |
| 2120 | - self.temp_dir, "ftp", "dists", "raring", component, "source") |
| 2121 | + self.temp_dir, "ftp", "dists", "trusty", component, "source") |
| 2122 | os.makedirs(source_dir) |
| 2123 | with gzip.GzipFile( |
| 2124 | os.path.join(source_dir, "Sources.gz"), "wb") as sources: |
| 2125 | sources.write(component.encode("UTF-8")) |
| 2126 | sources.write(b"\n") |
| 2127 | - files.append("dists/raring/%s/source/Sources.gz" % component) |
| 2128 | + files.append("dists/trusty/%s/source/Sources.gz" % component) |
| 2129 | self.germination.make_index("ubuntu", "i386", files[0], files) |
| 2130 | output_file = os.path.join( |
| 2131 | - self.temp_dir, "scratch", "ubuntu", "raring", "daily", "germinate", |
| 2132 | - "dists", "raring", "main", "source", "Sources.gz") |
| 2133 | + self.temp_dir, "scratch", "ubuntu", "trusty", "daily", "germinate", |
| 2134 | + "dists", "trusty", "main", "source", "Sources.gz") |
| 2135 | self.assertTrue(os.path.exists(output_file)) |
| 2136 | with gzip.GzipFile(output_file, "rb") as output_sources: |
| 2137 | self.assertEqual( |
| 2138 | @@ -179,27 +172,19 @@ |
| 2139 | ], self.germination.germinate_dists) |
| 2140 | |
| 2141 | def test_germinate_dists_no_proposed(self): |
| 2142 | - self.config["DIST"] = "raring" |
| 2143 | + self.config["DIST"] = "trusty" |
| 2144 | self.assertEqual([ |
| 2145 | - "raring", |
| 2146 | - "raring-security", |
| 2147 | - "raring-updates", |
| 2148 | + "trusty", |
| 2149 | + "trusty-security", |
| 2150 | + "trusty-updates", |
| 2151 | ], self.germination.germinate_dists) |
| 2152 | |
| 2153 | def test_seed_dist(self): |
| 2154 | for project, series, seed_dist in ( |
| 2155 | - ("ubuntu", "raring", "ubuntu.raring"), |
| 2156 | - ("ubuntu-server", "breezy", "ubuntu-server.breezy"), |
| 2157 | - ("ubuntu-server", "raring", "ubuntu.raring"), |
| 2158 | - ("jeos", "breezy", "jeos.breezy"), |
| 2159 | - ("jeos", "hardy", "ubuntu.hardy"), |
| 2160 | - ("ubuntukylin", "raring", "ubuntu.raring"), |
| 2161 | - ("ubuntukylin", "utopic", "ubuntukylin.utopic"), |
| 2162 | - ("ubuntu-mid", "hardy", "mobile.hardy"), |
| 2163 | - ("ubuntu-netbook", "maverick", "netbook.maverick"), |
| 2164 | - ("ubuntu-headless", "lucid", "ubuntu.lucid"), |
| 2165 | - ("ubuntu-moblin-remix", "hardy", "moblin.hardy"), |
| 2166 | - ("ubuntu-desktop-next", "utopic", "ubuntu-touch.utopic"), |
| 2167 | + ("ubuntu", "trusty", "ubuntu.trusty"), |
| 2168 | + ("ubuntu-server", "trusty", "ubuntu.trusty"), |
| 2169 | + ("ubuntukylin", "trusty", "ubuntu.trusty"), |
| 2170 | + ("ubuntukylin", "xenial", "ubuntukylin.xenial"), |
| 2171 | ): |
| 2172 | self.config["DIST"] = series |
| 2173 | self.assertEqual(seed_dist, self.germination.seed_dist(project)) |
| 2174 | @@ -224,13 +209,13 @@ |
| 2175 | self.temp_dir, "germinate", "bin", "germinate") |
| 2176 | touch(germinate_path) |
| 2177 | os.chmod(germinate_path, 0o755) |
| 2178 | - self.config["DIST"] = "raring" |
| 2179 | + self.config["DIST"] = "trusty" |
| 2180 | self.config["IMAGE_TYPE"] = "daily" |
| 2181 | |
| 2182 | - output_dir = "%s/scratch/ubuntu/raring/daily/germinate" % self.temp_dir |
| 2183 | + output_dir = "%s/scratch/ubuntu/trusty/daily/germinate" % self.temp_dir |
| 2184 | expected_files = [] |
| 2185 | |
| 2186 | - for dist in "raring", "raring-security", "raring-updates": |
| 2187 | + for dist in "trusty", "trusty-security", "trusty-updates": |
| 2188 | for suffix in ( |
| 2189 | "binary-amd64/Packages.gz", |
| 2190 | "source/Sources.gz", |
| 2191 | @@ -257,8 +242,8 @@ |
| 2192 | "--seed-source", |
| 2193 | "https://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/", |
| 2194 | "--mirror", "file://%s/" % output_dir, |
| 2195 | - "--seed-dist", "ubuntu.raring", |
| 2196 | - "--dist", "raring,raring-security,raring-updates", |
| 2197 | + "--seed-dist", "ubuntu.trusty", |
| 2198 | + "--dist", "trusty,trusty-security,trusty-updates", |
| 2199 | "--arch", "amd64", |
| 2200 | "--components", "main", |
| 2201 | "--no-rdepends", |
| 2202 | @@ -272,19 +257,19 @@ |
| 2203 | @mock.patch("cdimage.germinate.Germination.germinate_arch") |
| 2204 | def test_germinate_project(self, mock_germinate_arch): |
| 2205 | self.config.root = self.use_temp_dir() |
| 2206 | - self.config["DIST"] = "raring" |
| 2207 | + self.config["DIST"] = "trusty" |
| 2208 | self.config["ARCHES"] = "amd64 i386" |
| 2209 | self.config["IMAGE_TYPE"] = "daily" |
| 2210 | self.capture_logging() |
| 2211 | self.germination.germinate_project("ubuntu") |
| 2212 | self.assertTrue(os.path.isdir(os.path.join( |
| 2213 | - self.temp_dir, "scratch", "ubuntu", "raring", "daily", |
| 2214 | + self.temp_dir, "scratch", "ubuntu", "trusty", "daily", |
| 2215 | "germinate"))) |
| 2216 | mock_germinate_arch.assert_has_calls( |
| 2217 | [mock.call("ubuntu", "amd64"), mock.call("ubuntu", "i386")]) |
| 2218 | self.assertLogEqual([ |
| 2219 | - "Germinating for raring/amd64 ...", |
| 2220 | - "Germinating for raring/i386 ...", |
| 2221 | + "Germinating for trusty/amd64 ...", |
| 2222 | + "Germinating for trusty/i386 ...", |
| 2223 | ]) |
| 2224 | |
| 2225 | @mock.patch("cdimage.germinate.Germination.germinate_project") |
| 2226 | @@ -367,45 +352,6 @@ |
| 2227 | ["usb-ship-live", ["usb-langsupport"]], |
| 2228 | ]) |
| 2229 | |
| 2230 | - def write_ubuntu_hoary_structure(self): |
| 2231 | - """Write the Ubuntu 5.04 STRUCTURE file.""" |
| 2232 | - self.write_structure([ |
| 2233 | - ["base", []], |
| 2234 | - ["desktop", ["base"]], |
| 2235 | - ["ship", ["base", "desktop"]], |
| 2236 | - ["live", ["base", "desktop"]], |
| 2237 | - ["installer", []], |
| 2238 | - ["casper", []], |
| 2239 | - ["supported", ["base", "desktop", "ship", "live"]], |
| 2240 | - ]) |
| 2241 | - |
| 2242 | - def write_ubuntu_breezy_structure(self): |
| 2243 | - """Write the Ubuntu 5.10 STRUCTURE file.""" |
| 2244 | - self.write_structure([ |
| 2245 | - ["minimal", []], |
| 2246 | - ["standard", ["minimal"]], |
| 2247 | - ["desktop", ["minimal", "standard"]], |
| 2248 | - ["ship", ["minimal", "standard", "desktop"]], |
| 2249 | - ["live", ["minimal", "standard", "desktop"]], |
| 2250 | - ["installer", []], |
| 2251 | - ["casper", []], |
| 2252 | - ["supported", ["minimal", "standard", "desktop", "ship", "live"]], |
| 2253 | - ]) |
| 2254 | - |
| 2255 | - def write_ubuntu_dapper_structure(self): |
| 2256 | - """Write a reduced version of the Ubuntu 6.06 LTS STRUCTURE file.""" |
| 2257 | - self.write_structure([ |
| 2258 | - ["minimal", []], |
| 2259 | - ["boot", []], |
| 2260 | - ["standard", ["minimal"]], |
| 2261 | - ["desktop", ["minimal", "standard"]], |
| 2262 | - ["server", ["boot", "minimal", "standard"]], |
| 2263 | - ["ship", ["boot", "minimal", "standard", "desktop"]], |
| 2264 | - ["live", ["minimal", "standard", "desktop"]], |
| 2265 | - ["ship-live", ["boot", "minimal", "standard", "desktop", "live"]], |
| 2266 | - ["installer", []], |
| 2267 | - ]) |
| 2268 | - |
| 2269 | def write_kubuntu_structure(self): |
| 2270 | """Write a reduced version of the Kubuntu STRUCTURE file. |
| 2271 | |
| 2272 | @@ -471,7 +417,7 @@ |
| 2273 | self.write_ubuntu_structure() |
| 2274 | output = GerminateOutput(self.config, self.temp_dir) |
| 2275 | self.config["PROJECT"] = "ubuntu" |
| 2276 | - self.config["DIST"] = "raring" |
| 2277 | + self.config["DIST"] = "trusty" |
| 2278 | expected = [ |
| 2279 | "boot", "installer", "required", "minimal", "standard", |
| 2280 | "desktop-common", "desktop", "d-i-requirements", "ship", |
| 2281 | @@ -487,16 +433,6 @@ |
| 2282 | self.config["PROJECT"] = "ubuntu-server" |
| 2283 | expected = [ |
| 2284 | "boot", "installer", "required", "minimal", "standard", |
| 2285 | - "desktop-common", "desktop", "d-i-requirements", "ship", |
| 2286 | - ] |
| 2287 | - for series in all_series[:3]: |
| 2288 | - self.config["DIST"] = series |
| 2289 | - self.assertEqual(expected, list(output.list_seeds("tasks"))) |
| 2290 | - expected = ["required", "minimal", "standard", "server"] |
| 2291 | - self.config["DIST"] = all_series[3] |
| 2292 | - self.assertEqual(expected, list(output.list_seeds("tasks"))) |
| 2293 | - expected = [ |
| 2294 | - "boot", "installer", "required", "minimal", "standard", |
| 2295 | "dns-server", "lamp-server", "openssh-server", "print-server", |
| 2296 | "samba-server", "postgresql-server", "mail-server", "server", |
| 2297 | "tomcat-server", "virt-host", "d-i-requirements", "server-ship", |
| 2298 | @@ -509,7 +445,7 @@ |
| 2299 | self.write_ubuntu_structure() |
| 2300 | output = GerminateOutput(self.config, self.temp_dir) |
| 2301 | self.config["PROJECT"] = "ubuntu-server" |
| 2302 | - self.config["DIST"] = "raring" |
| 2303 | + self.config["DIST"] = "trusty" |
| 2304 | self.config["CDIMAGE_SQUASHFS_BASE"] = "1" |
| 2305 | expected = [ |
| 2306 | "boot", "installer", "standard", "dns-server", "lamp-server", |
| 2307 | @@ -523,7 +459,7 @@ |
| 2308 | self.write_kubuntu_structure() |
| 2309 | output = GerminateOutput(self.config, self.temp_dir) |
| 2310 | self.config["PROJECT"] = "kubuntu-active" |
| 2311 | - self.config["DIST"] = "raring" |
| 2312 | + self.config["DIST"] = "trusty" |
| 2313 | expected = [ |
| 2314 | "boot", "installer", "required", "minimal", "standard", |
| 2315 | "desktop-common", "desktop", "d-i-requirements", "ship", |
| 2316 | @@ -531,44 +467,17 @@ |
| 2317 | ] |
| 2318 | self.assertEqual(expected, list(output.list_seeds("tasks"))) |
| 2319 | |
| 2320 | - def test_list_seeds_tasks_jeos(self): |
| 2321 | - self.write_structure([ |
| 2322 | - ["required", []], |
| 2323 | - ["minimal", ["required"]], |
| 2324 | - ["jeos", ["minimal"]], |
| 2325 | - ]) |
| 2326 | - output = GerminateOutput(self.config, self.temp_dir) |
| 2327 | - self.config["PROJECT"] = "jeos" |
| 2328 | - self.assertEqual( |
| 2329 | - ["required", "minimal", "jeos"], list(output.list_seeds("tasks"))) |
| 2330 | - |
| 2331 | def test_list_seeds_installer(self): |
| 2332 | - self.write_ubuntu_breezy_structure() |
| 2333 | self.write_structure([["installer", []], ["casper", []]]) |
| 2334 | output = GerminateOutput(self.config, self.temp_dir) |
| 2335 | self.config["CDIMAGE_INSTALL_BASE"] = "1" |
| 2336 | self.assertEqual(["installer"], list(output.list_seeds("installer"))) |
| 2337 | del self.config["CDIMAGE_INSTALL_BASE"] |
| 2338 | self.config["CDIMAGE_LIVE"] = "1" |
| 2339 | - self.config["DIST"] = "hoary" |
| 2340 | - self.assertEqual(["casper"], list(output.list_seeds("installer"))) |
| 2341 | - self.config["DIST"] = "breezy" |
| 2342 | - self.assertEqual(["casper"], list(output.list_seeds("installer"))) |
| 2343 | - self.config["DIST"] = "dapper" |
| 2344 | + self.config["DIST"] = "precise" |
| 2345 | self.assertEqual([], list(output.list_seeds("installer"))) |
| 2346 | |
| 2347 | def test_list_seeds_debootstrap(self): |
| 2348 | - self.write_ubuntu_hoary_structure() |
| 2349 | - output = GerminateOutput(self.config, self.temp_dir) |
| 2350 | - for series in all_series[:2]: |
| 2351 | - self.config["DIST"] = series |
| 2352 | - self.assertEqual(["base"], list(output.list_seeds("debootstrap"))) |
| 2353 | - self.write_ubuntu_breezy_structure() |
| 2354 | - output = GerminateOutput(self.config, self.temp_dir) |
| 2355 | - for series in all_series[2:6]: |
| 2356 | - self.config["DIST"] = series |
| 2357 | - self.assertEqual( |
| 2358 | - ["minimal"], list(output.list_seeds("debootstrap"))) |
| 2359 | self.write_ubuntu_structure() |
| 2360 | output = GerminateOutput(self.config, self.temp_dir) |
| 2361 | for series in all_series[6:]: |
| 2362 | @@ -578,23 +487,6 @@ |
| 2363 | list(output.list_seeds("debootstrap"))) |
| 2364 | |
| 2365 | def test_list_seeds_base(self): |
| 2366 | - self.write_ubuntu_hoary_structure() |
| 2367 | - output = GerminateOutput(self.config, self.temp_dir) |
| 2368 | - for series in all_series[:2]: |
| 2369 | - self.config["DIST"] = series |
| 2370 | - self.assertEqual(["base"], list(output.list_seeds("base"))) |
| 2371 | - self.write_ubuntu_breezy_structure() |
| 2372 | - output = GerminateOutput(self.config, self.temp_dir) |
| 2373 | - self.config["DIST"] = all_series[2] |
| 2374 | - self.assertEqual( |
| 2375 | - ["minimal", "standard"], list(output.list_seeds("base"))) |
| 2376 | - self.write_ubuntu_dapper_structure() |
| 2377 | - output = GerminateOutput(self.config, self.temp_dir) |
| 2378 | - for series in all_series[3:6]: |
| 2379 | - self.config["DIST"] = series |
| 2380 | - self.assertEqual( |
| 2381 | - ["boot", "minimal", "standard"], |
| 2382 | - list(output.list_seeds("base"))) |
| 2383 | self.write_ubuntu_structure() |
| 2384 | output = GerminateOutput(self.config, self.temp_dir) |
| 2385 | for series in all_series[6:]: |
| 2386 | @@ -615,7 +507,7 @@ |
| 2387 | def write_seed_output(self, arch, seed, packages): |
| 2388 | """Write a simplified Germinate output file, enough for testing.""" |
| 2389 | with mkfile(os.path.join(self.temp_dir, arch, seed)) as f: |
| 2390 | - why = "Ubuntu.Raring %s seed" % seed |
| 2391 | + why = "Ubuntu.Trusty %s seed" % seed |
| 2392 | pkg_len = max(len("Package"), max(map(len, packages))) |
| 2393 | src_len = max(len("Source"), max(map(len, packages))) |
| 2394 | why_len = len(why) |
| 2395 | @@ -660,20 +552,20 @@ |
| 2396 | "usb-ship-live", |
| 2397 | ], list(output.master_seeds())) |
| 2398 | |
| 2399 | - def test_master_seeds_dvd_ubuntu_raring(self): |
| 2400 | + def test_master_seeds_dvd_ubuntu_trusty(self): |
| 2401 | self.write_ubuntu_structure() |
| 2402 | output = GerminateOutput(self.config, self.temp_dir) |
| 2403 | self.config["PROJECT"] = "ubuntu" |
| 2404 | - self.config["DIST"] = "raring" |
| 2405 | + self.config["DIST"] = "trusty" |
| 2406 | self.config["CDIMAGE_DVD"] = "1" |
| 2407 | self.assertEqual( |
| 2408 | ["usb-langsupport", "usb-ship-live"], list(output.master_seeds())) |
| 2409 | |
| 2410 | - def test_master_seeds_install_ubuntu_raring(self): |
| 2411 | + def test_master_seeds_install_ubuntu_trusty(self): |
| 2412 | self.write_ubuntu_structure() |
| 2413 | output = GerminateOutput(self.config, self.temp_dir) |
| 2414 | self.config["PROJECT"] = "ubuntu" |
| 2415 | - self.config["DIST"] = "raring" |
| 2416 | + self.config["DIST"] = "trusty" |
| 2417 | self.config["CDIMAGE_INSTALL"] = "1" |
| 2418 | self.config["CDIMAGE_INSTALL_BASE"] = "1" |
| 2419 | self.assertEqual([ |
| 2420 | @@ -681,11 +573,11 @@ |
| 2421 | "desktop-common", "desktop", "d-i-requirements", "ship", |
| 2422 | ], list(output.master_seeds())) |
| 2423 | |
| 2424 | - def test_master_seeds_live_ubuntu_raring(self): |
| 2425 | + def test_master_seeds_live_ubuntu_trusty(self): |
| 2426 | self.write_ubuntu_structure() |
| 2427 | output = GerminateOutput(self.config, self.temp_dir) |
| 2428 | self.config["PROJECT"] = "ubuntu" |
| 2429 | - self.config["DIST"] = "raring" |
| 2430 | + self.config["DIST"] = "trusty" |
| 2431 | self.config["CDIMAGE_INSTALL_BASE"] = "1" |
| 2432 | self.config["CDIMAGE_LIVE"] = "1" |
| 2433 | self.assertEqual([ |
| 2434 | @@ -701,11 +593,11 @@ |
| 2435 | |
| 2436 | self.write_ubuntu_structure() |
| 2437 | output = GerminateOutput(self.config, self.temp_dir) |
| 2438 | - self.config["DIST"] = "raring" |
| 2439 | + self.config["DIST"] = "trusty" |
| 2440 | mock_master_seeds.side_effect = side_effect |
| 2441 | self.assertEqual([ |
| 2442 | - "#include <ubuntu/raring/required>", |
| 2443 | - "#include <ubuntu/raring/minimal>", |
| 2444 | + "#include <ubuntu/trusty/required>", |
| 2445 | + "#include <ubuntu/trusty/minimal>", |
| 2446 | ], list(output.master_task_entries("ubuntu"))) |
| 2447 | |
| 2448 | @mock.patch( |
| 2449 | @@ -713,18 +605,18 @@ |
| 2450 | def test_master_task_entries_no_seeds(self, mock_master_seeds): |
| 2451 | self.write_ubuntu_structure() |
| 2452 | output = GerminateOutput(self.config, self.temp_dir) |
| 2453 | - self.config["DIST"] = "raring" |
| 2454 | + self.config["DIST"] = "trusty" |
| 2455 | self.assertRaises( |
| 2456 | NoMasterSeeds, list, output.master_task_entries("ubuntu")) |
| 2457 | |
| 2458 | def test_tasks_output_dir(self): |
| 2459 | self.write_ubuntu_structure() |
| 2460 | output = GerminateOutput(self.config, self.temp_dir) |
| 2461 | - self.config["DIST"] = "raring" |
| 2462 | + self.config["DIST"] = "trusty" |
| 2463 | self.config["IMAGE_TYPE"] = "daily" |
| 2464 | self.assertEqual( |
| 2465 | os.path.join( |
| 2466 | - self.temp_dir, "scratch", "ubuntu", "raring", "daily", |
| 2467 | + self.temp_dir, "scratch", "ubuntu", "trusty", "daily", |
| 2468 | "tasks"), |
| 2469 | output.tasks_output_dir("ubuntu")) |
| 2470 | |
| 2471 | @@ -753,7 +645,7 @@ |
| 2472 | def test_task_packages_squashfs(self): |
| 2473 | self.write_ubuntu_structure() |
| 2474 | self.config["PROJECT"] = "ubuntu-server" |
| 2475 | - self.config["DIST"] = "raring" |
| 2476 | + self.config["DIST"] = "trusty" |
| 2477 | self.write_seed_output( |
| 2478 | "i386", "installer", ["base-installer", "bootstrap-base"]) |
| 2479 | output = GerminateOutput(self.config, self.temp_dir) |
| 2480 | @@ -765,26 +657,6 @@ |
| 2481 | ["base-installer", "live-installer"], |
| 2482 | list(output.task_packages("i386", "installer", "installer"))) |
| 2483 | |
| 2484 | - def test_task_packages_gutsy_ps3_hack(self): |
| 2485 | - self.write_structure([["boot", []], ["installer", []]]) |
| 2486 | - self.write_seed_output( |
| 2487 | - "powerpc+ps3", "boot", ["linux-image-2.6.22-14-powerpc64-smp"]) |
| 2488 | - self.write_seed_output( |
| 2489 | - "powerpc+ps3", "installer", [ |
| 2490 | - "block-modules-2.6.22-14-powerpc-di", |
| 2491 | - "block-modules-2.6.22-14-powerpc64-smp-di", |
| 2492 | - ]) |
| 2493 | - self.config["DIST"] = "gutsy" |
| 2494 | - self.config["CDIMAGE_INSTALL_BASE"] = "1" |
| 2495 | - output = GerminateOutput(self.config, self.temp_dir) |
| 2496 | - self.assertEqual( |
| 2497 | - ["linux-image-2.6.22-14-cell"], |
| 2498 | - list(output.task_packages("powerpc+ps3", "boot", "boot"))) |
| 2499 | - self.assertEqual( |
| 2500 | - ["block-modules-2.6.22-14-cell-di"], |
| 2501 | - list(output.task_packages( |
| 2502 | - "powerpc+ps3", "installer", "installer"))) |
| 2503 | - |
| 2504 | def test_task_packages_precise_kernels(self): |
| 2505 | self.write_structure([["boot", []], ["installer", []]]) |
| 2506 | self.write_seed_output( |
| 2507 | @@ -812,7 +684,7 @@ |
| 2508 | def test_initrd_packages(self): |
| 2509 | self.write_ubuntu_structure() |
| 2510 | manifest_path = os.path.join( |
| 2511 | - self.temp_dir, "ftp", "dists", "raring", "main", "installer-i386", |
| 2512 | + self.temp_dir, "ftp", "dists", "trusty", "main", "installer-i386", |
| 2513 | "current", "images", "MANIFEST.udebs") |
| 2514 | with mkfile(manifest_path) as manifest: |
| 2515 | print(dedent("""\ |
| 2516 | @@ -822,7 +694,7 @@ |
| 2517 | netboot/netboot.tar.gz |
| 2518 | \tdownload-installer 1.32ubuntu1 all |
| 2519 | \tnet-retriever 1.32ubuntu1 i386"""), file=manifest) |
| 2520 | - self.config["DIST"] = "raring" |
| 2521 | + self.config["DIST"] = "trusty" |
| 2522 | output = GerminateOutput(self.config, self.temp_dir) |
| 2523 | self.assertEqual( |
| 2524 | set(["anna", "cdrom-detect"]), |
| 2525 | @@ -835,7 +707,7 @@ |
| 2526 | def test_common_initrd_packages(self): |
| 2527 | self.write_ubuntu_structure() |
| 2528 | manifest_path = os.path.join( |
| 2529 | - self.temp_dir, "ftp", "dists", "raring", "main", "installer-i386", |
| 2530 | + self.temp_dir, "ftp", "dists", "trusty", "main", "installer-i386", |
| 2531 | "current", "images", "MANIFEST.udebs") |
| 2532 | with mkfile(manifest_path) as manifest: |
| 2533 | print(dedent("""\ |
| 2534 | @@ -845,7 +717,7 @@ |
| 2535 | netboot/netboot.tar.gz |
| 2536 | \tanna 1.45ubuntu1 i386 |
| 2537 | \tnet-retriever 1.32ubuntu1 i386"""), file=manifest) |
| 2538 | - self.config["DIST"] = "raring" |
| 2539 | + self.config["DIST"] = "trusty" |
| 2540 | output = GerminateOutput(self.config, self.temp_dir) |
| 2541 | self.assertEqual(set(["anna"]), output.common_initrd_packages("i386")) |
| 2542 | |
| 2543 | @@ -870,8 +742,6 @@ |
| 2544 | self.assertEqual(expected, output.task_headers("i386", "desktop")) |
| 2545 | self.assertEqual({}, output.task_headers("i386", "missing")) |
| 2546 | |
| 2547 | - # TODO: seed_task_mapping <= gutsy untested |
| 2548 | - |
| 2549 | def test_seed_task_mapping(self): |
| 2550 | self.write_ubuntu_structure() |
| 2551 | seed_dir = os.path.join(self.temp_dir, "i386") |
| 2552 | @@ -881,7 +751,7 @@ |
| 2553 | print(dedent("""\ |
| 2554 | Task-Per-Derivative: 1 |
| 2555 | Task-Seeds: desktop-common"""), file=seedtext) |
| 2556 | - self.config["DIST"] = "raring" |
| 2557 | + self.config["DIST"] = "trusty" |
| 2558 | output = GerminateOutput(self.config, self.temp_dir) |
| 2559 | expected = [ |
| 2560 | (["standard"], "standard"), |
| 2561 | @@ -906,14 +776,14 @@ |
| 2562 | print("Task-Per-Derivative: 1", file=seedtext) |
| 2563 | with mkfile(os.path.join(seed_dir, "live.seedtext")) as seedtext: |
| 2564 | print("Task-Per-Derivative: 1", file=seedtext) |
| 2565 | - self.config["DIST"] = "raring" |
| 2566 | + self.config["DIST"] = "trusty" |
| 2567 | self.config["ARCHES"] = "amd64 i386" |
| 2568 | self.config["IMAGE_TYPE"] = "daily-live" |
| 2569 | self.config["CDIMAGE_LIVE"] = "1" |
| 2570 | output = GerminateOutput(self.config, self.temp_dir) |
| 2571 | output.write_tasks_project("ubuntu") |
| 2572 | output_dir = os.path.join( |
| 2573 | - self.temp_dir, "scratch", "ubuntu", "raring", "daily-live", |
| 2574 | + self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live", |
| 2575 | "tasks") |
| 2576 | self.assertCountEqual([ |
| 2577 | "required", "minimal", "desktop", "live", |
| 2578 | @@ -990,7 +860,7 @@ |
| 2579 | with open(os.path.join(output_dir, "important.i386")) as f: |
| 2580 | self.assertEqual("adduser-i386\nbase-files-i386\n", f.read()) |
| 2581 | with open(os.path.join(output_dir, "MASTER")) as f: |
| 2582 | - self.assertEqual("#include <ubuntu/raring/ship-live>\n", f.read()) |
| 2583 | + self.assertEqual("#include <ubuntu/trusty/ship-live>\n", f.read()) |
| 2584 | |
| 2585 | # TODO: write_tasks untested |
| 2586 | |
| 2587 | @@ -998,10 +868,10 @@ |
| 2588 | def test_diff_tasks(self, mock_call): |
| 2589 | self.write_ubuntu_structure() |
| 2590 | self.config["PROJECT"] = "ubuntu" |
| 2591 | - self.config["DIST"] = "raring" |
| 2592 | + self.config["DIST"] = "trusty" |
| 2593 | self.config["IMAGE_TYPE"] = "daily-live" |
| 2594 | output_dir = os.path.join( |
| 2595 | - self.temp_dir, "scratch", "ubuntu", "raring", "daily-live", |
| 2596 | + self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live", |
| 2597 | "tasks") |
| 2598 | touch(os.path.join(output_dir, "required")) |
| 2599 | touch(os.path.join(output_dir, "minimal")) |
| 2600 | @@ -1026,10 +896,10 @@ |
| 2601 | def test_update_tasks_no_mail(self, mock_diff_tasks): |
| 2602 | self.write_ubuntu_structure() |
| 2603 | self.config["PROJECT"] = "ubuntu" |
| 2604 | - self.config["DIST"] = "raring" |
| 2605 | + self.config["DIST"] = "trusty" |
| 2606 | self.config["IMAGE_TYPE"] = "daily-live" |
| 2607 | output_dir = os.path.join( |
| 2608 | - self.temp_dir, "scratch", "ubuntu", "raring", "daily-live", |
| 2609 | + self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live", |
| 2610 | "tasks") |
| 2611 | touch(os.path.join(output_dir, "required")) |
| 2612 | touch(os.path.join(output_dir, "minimal")) |
| 2613 | @@ -1039,7 +909,7 @@ |
| 2614 | ["required", "minimal"], |
| 2615 | os.listdir(os.path.join( |
| 2616 | self.temp_dir, "debian-cd", "tasks", "auto", "daily-live", |
| 2617 | - "ubuntu", "raring"))) |
| 2618 | + "ubuntu", "trusty"))) |
| 2619 | self.assertCountEqual( |
| 2620 | ["required", "minimal"], os.listdir("%s-previous" % output_dir)) |
| 2621 | |
| 2622 | @@ -1048,7 +918,7 @@ |
| 2623 | def test_update_tasks_no_recipients(self, mock_diff_tasks, mock_send_mail): |
| 2624 | self.write_ubuntu_structure() |
| 2625 | self.config["PROJECT"] = "ubuntu" |
| 2626 | - self.config["DIST"] = "raring" |
| 2627 | + self.config["DIST"] = "trusty" |
| 2628 | self.config["IMAGE_TYPE"] = "daily-live" |
| 2629 | output = GerminateOutput(self.config, self.temp_dir) |
| 2630 | os.makedirs(output.tasks_output_dir("ubuntu")) |
| 2631 | @@ -1093,10 +963,10 @@ |
| 2632 | self.write_ubuntu_structure() |
| 2633 | self.config["PROJECT"] = "ubuntu" |
| 2634 | self.config["CAPPROJECT"] = "Ubuntu" |
| 2635 | - self.config["DIST"] = "raring" |
| 2636 | + self.config["DIST"] = "trusty" |
| 2637 | self.config["IMAGE_TYPE"] = "daily-live" |
| 2638 | output_dir = os.path.join( |
| 2639 | - self.temp_dir, "scratch", "ubuntu", "raring", "daily-live", |
| 2640 | + self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live", |
| 2641 | "tasks") |
| 2642 | touch(os.path.join(output_dir, "required")) |
| 2643 | touch(os.path.join(output_dir, "minimal")) |
| 2644 | @@ -1114,7 +984,7 @@ |
| 2645 | with open(os.path.join(self.temp_dir, "mail")) as mail: |
| 2646 | self.assertEqual(dedent("""\ |
| 2647 | To: foo@example.org |
| 2648 | - Subject: Task changes for Ubuntu daily-live/raring on 20130319 |
| 2649 | + Subject: Task changes for Ubuntu daily-live/trusty on 20130319 |
| 2650 | X-Generated-By: update-tasks |
| 2651 | |
| 2652 | --- minimal |
| 2653 | |
| 2654 | === modified file 'lib/cdimage/tests/test_livefs.py' |
| 2655 | --- lib/cdimage/tests/test_livefs.py 2018-12-12 20:29:20 +0000 |
| 2656 | +++ lib/cdimage/tests/test_livefs.py 2019-02-28 22:59:07 +0000 |
| 2657 | @@ -173,48 +173,26 @@ |
| 2658 | def test_project_livecd_base(self): |
| 2659 | self.assertProjectEqual("base", "livecd-base", "dapper") |
| 2660 | |
| 2661 | - def test_project_tocd3_1(self): |
| 2662 | - self.assertProjectEqual("tocd", "tocd3.1", "breezy") |
| 2663 | - |
| 2664 | - def test_project_ubuntu_touch_custom(self): |
| 2665 | - self.assertProjectEqual("ubuntu-touch", "ubuntu-touch-custom", "vivid") |
| 2666 | - |
| 2667 | def test_ubuntu_dvd(self): |
| 2668 | - for series in all_series[:7]: |
| 2669 | - self.assertProjectEqual( |
| 2670 | - "ubuntu", "ubuntu", series, cdimage_dvd="1") |
| 2671 | for series in all_series[7:]: |
| 2672 | self.assertProjectEqual( |
| 2673 | "ubuntu-dvd", "ubuntu", series, cdimage_dvd="1") |
| 2674 | |
| 2675 | def test_kubuntu_dvd(self): |
| 2676 | - for series in all_series[:7]: |
| 2677 | - self.assertProjectEqual( |
| 2678 | - "kubuntu", "kubuntu", series, cdimage_dvd="1") |
| 2679 | for series in all_series[7:]: |
| 2680 | self.assertProjectEqual( |
| 2681 | "kubuntu-dvd", "kubuntu", series, cdimage_dvd="1") |
| 2682 | |
| 2683 | def test_edubuntu_dvd(self): |
| 2684 | - for series in all_series[:10]: |
| 2685 | - self.assertProjectEqual( |
| 2686 | - "edubuntu", "edubuntu", series, cdimage_dvd="1") |
| 2687 | for series in all_series[10:]: |
| 2688 | self.assertProjectEqual( |
| 2689 | "edubuntu-dvd", "edubuntu", series, cdimage_dvd="1") |
| 2690 | |
| 2691 | def test_ubuntustudio_dvd(self): |
| 2692 | - for series in all_series[:15]: |
| 2693 | - self.assertProjectEqual( |
| 2694 | - "ubuntustudio", "ubuntustudio", series, cdimage_dvd="1") |
| 2695 | for series in all_series[15:]: |
| 2696 | self.assertProjectEqual( |
| 2697 | "ubuntustudio-dvd", "ubuntustudio", series, cdimage_dvd="1") |
| 2698 | |
| 2699 | - def test_lpia(self): |
| 2700 | - self.assertProjectEqual("ubuntu-lpia", "ubuntu", "hardy", arch="lpia") |
| 2701 | - self.assertProjectEqual("ubuntu", "ubuntu", "intrepid", arch="lpia") |
| 2702 | - |
| 2703 | |
| 2704 | def make_livefs_production_config(config): |
| 2705 | config_path = os.path.join(config.root, "production", "livefs-builders") |
| 2706 | @@ -233,8 +211,6 @@ |
| 2707 | *\t\t*\t\thppa\t\t\tcastilla.buildd |
| 2708 | *\t\t*\t\ti386\t\t\tcardamom.buildd |
| 2709 | *\t\t*\t\tia64\t\t\tweddell.buildd |
| 2710 | - *\t\t-hardy\t\tlpia\t\t\tcardamom.buildd |
| 2711 | - *\t\t*\t\tlpia\t\t\tconcordia.buildd |
| 2712 | *\t\t*\t\tpowerpc\t\t\troyal.buildd |
| 2713 | *\t\t*\t\tppc64el\t\t\tfisher01.buildd |
| 2714 | *\t\t*\t\tsparc\t\t\tvivies.buildd |
| 2715 | @@ -297,12 +273,6 @@ |
| 2716 | for series in all_series: |
| 2717 | self.assertBuilderEqual("weddell.buildd", "ia64", series) |
| 2718 | |
| 2719 | - def test_lpia(self): |
| 2720 | - for series in all_series[:8]: |
| 2721 | - self.assertBuilderEqual("cardamom.buildd", "lpia", series) |
| 2722 | - for series in all_series[8:]: |
| 2723 | - self.assertBuilderEqual("concordia.buildd", "lpia", series) |
| 2724 | - |
| 2725 | def test_powerpc(self): |
| 2726 | for series in all_series: |
| 2727 | self.assertBuilderEqual("royal.buildd", "powerpc", series) |
| 2728 | @@ -364,16 +334,11 @@ |
| 2729 | self.assertEqual( |
| 2730 | ["-f", "plain"], live_build_options(self.config, "armhf")) |
| 2731 | |
| 2732 | - def test_ubuntu_touch_custom(self): |
| 2733 | - self.config["PROJECT"] = "ubuntu-touch-custom" |
| 2734 | - self.assertEqual( |
| 2735 | - ["-f", "plain"], live_build_options(self.config, "armhf")) |
| 2736 | - |
| 2737 | def test_wubi(self): |
| 2738 | self.config["SUBPROJECT"] = "wubi" |
| 2739 | for series, fstype in ( |
| 2740 | ("precise", "ext3"), |
| 2741 | - ("quantal", "ext3"), # ext4 |
| 2742 | + ("trusty", "ext3"), # ext4 |
| 2743 | ): |
| 2744 | self.config["DIST"] = series |
| 2745 | self.assertEqual( |
| 2746 | @@ -405,10 +370,10 @@ |
| 2747 | |
| 2748 | def test_basic(self): |
| 2749 | self.config["PROJECT"] = "ubuntu" |
| 2750 | - self.config["DIST"] = "raring" |
| 2751 | + self.config["DIST"] = "trusty" |
| 2752 | expected = self.base_expected + [ |
| 2753 | "buildd@cardamom.buildd", "/home/buildd/bin/BuildLiveCD", |
| 2754 | - "-l", "-A", "i386", "-d", "raring", "ubuntu", |
| 2755 | + "-l", "-A", "i386", "-d", "trusty", "ubuntu", |
| 2756 | ] |
| 2757 | self.assertEqual(expected, live_build_command(self.config, "i386")) |
| 2758 | |
| 2759 | @@ -417,8 +382,8 @@ |
| 2760 | self.assertCommandContains(["-u", "zh_CN"], "i386") |
| 2761 | |
| 2762 | def test_pre_live_build(self): |
| 2763 | - self.config["DIST"] = "natty" |
| 2764 | - self.assertNotIn("-l", live_build_command(self.config, "i386")) |
| 2765 | + self.config["DIST"] = "precise" |
| 2766 | + self.assertIn("-l", live_build_command(self.config, "i386")) |
| 2767 | |
| 2768 | @mock.patch( |
| 2769 | "cdimage.livefs.live_build_options", return_value=["-f", "plain"]) |
| 2770 | @@ -506,21 +471,21 @@ |
| 2771 | def test_live_build_notify_failure_no_log(self, mock_send_mail, *args): |
| 2772 | self.config.root = self.use_temp_dir() |
| 2773 | self.config["PROJECT"] = "ubuntu" |
| 2774 | - self.config["DIST"] = "raring" |
| 2775 | + self.config["DIST"] = "trusty" |
| 2776 | self.config["IMAGE_TYPE"] = "daily" |
| 2777 | path = os.path.join(self.temp_dir, "production", "notify-addresses") |
| 2778 | with mkfile(path) as notify_addresses: |
| 2779 | print("ALL\tfoo@example.org", file=notify_addresses) |
| 2780 | live_build_notify_failure(self.config, "i386") |
| 2781 | mock_send_mail.assert_called_once_with( |
| 2782 | - "LiveFS ubuntu/raring/i386 failed to build on 20130315", |
| 2783 | + "LiveFS ubuntu/trusty/i386 failed to build on 20130315", |
| 2784 | "buildlive", ["foo@example.org"], b"") |
| 2785 | |
| 2786 | @mock.patch("time.strftime", return_value="20130315") |
| 2787 | @mock.patch("cdimage.livefs.send_mail") |
| 2788 | def test_live_build_notify_failure_log(self, mock_send_mail, *args): |
| 2789 | self.config["PROJECT"] = "kubuntu" |
| 2790 | - self.config["DIST"] = "raring" |
| 2791 | + self.config["DIST"] = "trusty" |
| 2792 | self.config["IMAGE_TYPE"] = "daily" |
| 2793 | path = os.path.join(self.temp_dir, "production", "notify-addresses") |
| 2794 | with mkfile(path) as notify_addresses: |
| 2795 | @@ -529,10 +494,10 @@ |
| 2796 | with mock.patch("cdimage.livefs.urlopen", mock_urlopen_obj): |
| 2797 | live_build_notify_failure(self.config, "armhf+omap4") |
| 2798 | mock_urlopen_obj.assert_called_once_with( |
| 2799 | - "http://kishi00.buildd/~buildd/LiveCD/raring/kubuntu-omap4/latest/" |
| 2800 | + "http://kishi00.buildd/~buildd/LiveCD/trusty/kubuntu-omap4/latest/" |
| 2801 | "livecd-armhf.out", timeout=30) |
| 2802 | mock_send_mail.assert_called_once_with( |
| 2803 | - "LiveFS kubuntu-omap4/raring/armhf+omap4 failed to build on " |
| 2804 | + "LiveFS kubuntu-omap4/trusty/armhf+omap4 failed to build on " |
| 2805 | "20130315", |
| 2806 | "buildlive", ["foo@example.org"], b"Log data\n") |
| 2807 | |
| 2808 | @@ -542,7 +507,7 @@ |
| 2809 | @mock.patch("cdimage.livefs.send_mail") |
| 2810 | def test_run_live_builds_notifies_on_failure(self, mock_send_mail, *args): |
| 2811 | self.config["PROJECT"] = "ubuntu" |
| 2812 | - self.config["DIST"] = "raring" |
| 2813 | + self.config["DIST"] = "trusty" |
| 2814 | self.config["IMAGE_TYPE"] = "daily" |
| 2815 | self.config["ARCHES"] = "amd64 i386" |
| 2816 | path = os.path.join(self.temp_dir, "production", "notify-addresses") |
| 2817 | @@ -563,10 +528,10 @@ |
| 2818 | ], self.captured_log_messages()) |
| 2819 | mock_send_mail.assert_has_calls([ |
| 2820 | mock.call( |
| 2821 | - "LiveFS ubuntu/raring/amd64 failed to build on 20130315", |
| 2822 | + "LiveFS ubuntu/trusty/amd64 failed to build on 20130315", |
| 2823 | "buildlive", ["foo@example.org"], b"Log data\n"), |
| 2824 | mock.call( |
| 2825 | - "LiveFS ubuntu/raring/i386 failed to build on 20130315", |
| 2826 | + "LiveFS ubuntu/trusty/i386 failed to build on 20130315", |
| 2827 | "buildlive", ["foo@example.org"], b"Log data\n"), |
| 2828 | ], any_order=True) |
| 2829 | |
| 2830 | @@ -577,7 +542,7 @@ |
| 2831 | def test_run_live_builds(self, mock_live_build_notify_failure, mock_popen, |
| 2832 | mock_tracker_set_rebuild_status, *args): |
| 2833 | self.config["PROJECT"] = "ubuntu" |
| 2834 | - self.config["DIST"] = "raring" |
| 2835 | + self.config["DIST"] = "trusty" |
| 2836 | self.config["IMAGE_TYPE"] = "daily" |
| 2837 | self.config["ARCHES"] = "amd64 i386" |
| 2838 | self.capture_logging() |
| 2839 | @@ -605,12 +570,12 @@ |
| 2840 | mock.call( |
| 2841 | expected_command_base + [ |
| 2842 | "buildd@kapok.buildd", "/home/buildd/bin/BuildLiveCD", |
| 2843 | - "-l", "-A", "amd64", "-d", "raring", "ubuntu", |
| 2844 | + "-l", "-A", "amd64", "-d", "trusty", "ubuntu", |
| 2845 | ]), |
| 2846 | mock.call( |
| 2847 | expected_command_base + [ |
| 2848 | "buildd@cardamom.buildd", "/home/buildd/bin/BuildLiveCD", |
| 2849 | - "-l", "-A", "i386", "-d", "raring", "ubuntu", |
| 2850 | + "-l", "-A", "i386", "-d", "trusty", "ubuntu", |
| 2851 | ]) |
| 2852 | ]) |
| 2853 | self.assertEqual(0, mock_live_build_notify_failure.call_count) |
| 2854 | @@ -622,7 +587,7 @@ |
| 2855 | mock_live_build_notify_failure, |
| 2856 | mock_popen, *args): |
| 2857 | self.config["PROJECT"] = "ubuntu" |
| 2858 | - self.config["DIST"] = "raring" |
| 2859 | + self.config["DIST"] = "trusty" |
| 2860 | self.config["IMAGE_TYPE"] = "daily" |
| 2861 | self.config["ARCHES"] = "amd64 amd64+mac" |
| 2862 | self.capture_logging() |
| 2863 | @@ -632,7 +597,7 @@ |
| 2864 | "ssh", "-n", "-o", "StrictHostKeyChecking=no", |
| 2865 | "-o", "BatchMode=yes", |
| 2866 | "buildd@kapok.buildd", "/home/buildd/bin/BuildLiveCD", |
| 2867 | - "-l", "-A", "amd64", "-d", "raring", "ubuntu", |
| 2868 | + "-l", "-A", "amd64", "-d", "trusty", "ubuntu", |
| 2869 | ] |
| 2870 | mock_popen.assert_called_once_with(expected_command) |
| 2871 | self.assertEqual(0, mock_live_build_notify_failure.call_count) |
| 2872 | @@ -643,7 +608,7 @@ |
| 2873 | @mock.patch("cdimage.livefs.send_mail") |
| 2874 | def test_run_live_builds_partial_success(self, mock_send_mail, *args): |
| 2875 | self.config["PROJECT"] = "ubuntu" |
| 2876 | - self.config["DIST"] = "raring" |
| 2877 | + self.config["DIST"] = "trusty" |
| 2878 | self.config["IMAGE_TYPE"] = "daily" |
| 2879 | self.config["ARCHES"] = "amd64 i386" |
| 2880 | path = os.path.join(self.temp_dir, "production", "notify-addresses") |
| 2881 | @@ -677,17 +642,17 @@ |
| 2882 | mock.call( |
| 2883 | expected_command_base + [ |
| 2884 | "buildd@kapok.buildd", "/home/buildd/bin/BuildLiveCD", |
| 2885 | - "-l", "-A", "amd64", "-d", "raring", "ubuntu", |
| 2886 | + "-l", "-A", "amd64", "-d", "trusty", "ubuntu", |
| 2887 | ]), |
| 2888 | mock.call( |
| 2889 | expected_command_base + [ |
| 2890 | "buildd@cardamom.buildd", |
| 2891 | "/home/buildd/bin/BuildLiveCD", |
| 2892 | - "-l", "-A", "i386", "-d", "raring", "ubuntu", |
| 2893 | + "-l", "-A", "i386", "-d", "trusty", "ubuntu", |
| 2894 | ]), |
| 2895 | ]) |
| 2896 | mock_send_mail.assert_called_once_with( |
| 2897 | - "LiveFS ubuntu/raring/i386 failed to build on 20130315", |
| 2898 | + "LiveFS ubuntu/trusty/i386 failed to build on 20130315", |
| 2899 | "buildlive", ["foo@example.org"], b"Log data\n") |
| 2900 | |
| 2901 | @skipUnless(launchpad_available, "launchpadlib not available") |
| 2902 | @@ -702,7 +667,7 @@ |
| 2903 | mock_tracker_set_rebuild_status, mock_sleep, |
| 2904 | *args): |
| 2905 | self.config["PROJECT"] = "ubuntu" |
| 2906 | - self.config["DIST"] = "utopic" |
| 2907 | + self.config["DIST"] = "xenial" |
| 2908 | self.config["IMAGE_TYPE"] = "daily" |
| 2909 | self.config["ARCHES"] = "amd64 i386" |
| 2910 | osextras.unlink_force(os.path.join( |
| 2911 | @@ -737,13 +702,13 @@ |
| 2912 | lp = get_launchpad() |
| 2913 | owner = lp.people["ubuntu-cdimage"] |
| 2914 | ubuntu = lp.distributions["ubuntu"] |
| 2915 | - utopic = ubuntu.getSeries(name_or_version="utopic") |
| 2916 | + xenial = ubuntu.getSeries(name_or_version="xenial") |
| 2917 | dases = [ |
| 2918 | - utopic.getDistroArchSeries(archtag) |
| 2919 | + xenial.getDistroArchSeries(archtag) |
| 2920 | for archtag in ("amd64", "i386")] |
| 2921 | self.assertEqual(2, len(dases)) |
| 2922 | livefs = lp.livefses.getByName( |
| 2923 | - owner=owner, distro_series=utopic, name="ubuntu-desktop") |
| 2924 | + owner=owner, distro_series=xenial, name="ubuntu-desktop") |
| 2925 | builds = [ |
| 2926 | livefs.getLatestBuild(distro_arch_series=das) for das in dases] |
| 2927 | self.assertEqual(2, len(builds)) |
| 2928 | @@ -844,7 +809,7 @@ |
| 2929 | |
| 2930 | def test_livecd_override(self): |
| 2931 | self.assertBaseEqual( |
| 2932 | - "ftp://blah/quantal/ubuntu/current", "i386", "ubuntu", "quantal", |
| 2933 | + "ftp://blah/trusty/ubuntu/current", "i386", "ubuntu", "trusty", |
| 2934 | livecd="ftp://blah") |
| 2935 | |
| 2936 | def test_subproject(self): |
| 2937 | @@ -861,11 +826,11 @@ |
| 2938 | |
| 2939 | def test_subarch(self): |
| 2940 | self.assertBaseEqual( |
| 2941 | - self.base("royal.buildd", "ubuntu-ps3", "gutsy"), |
| 2942 | - "powerpc+ps3", "ubuntu", "gutsy") |
| 2943 | + self.base("royal.buildd", "ubuntu-ps3", "precise"), |
| 2944 | + "powerpc+ps3", "ubuntu", "precise") |
| 2945 | self.assertBaseEqual( |
| 2946 | - self.base("celbalrai.buildd", "ubuntu-server-omap", "oneiric"), |
| 2947 | - "armel+omap", "ubuntu-server", "oneiric") |
| 2948 | + self.base("celbalrai.buildd", "ubuntu-server-omap", "precise"), |
| 2949 | + "armel+omap", "ubuntu-server", "precise") |
| 2950 | |
| 2951 | def test_ubuntu_defaults_locale(self): |
| 2952 | for series in all_series: |
| 2953 | @@ -882,9 +847,6 @@ |
| 2954 | self.assertEqual(expected.split(), flavours(config, arch)) |
| 2955 | |
| 2956 | def test_amd64(self): |
| 2957 | - for series in all_series[:4]: |
| 2958 | - self.assertFlavoursEqual( |
| 2959 | - "amd64-generic", "amd64", "ubuntu", series) |
| 2960 | for series in all_series[4:]: |
| 2961 | self.assertFlavoursEqual( |
| 2962 | "generic", "amd64", "ubuntu", series) |
| 2963 | @@ -893,12 +855,11 @@ |
| 2964 | "lowlatency", "amd64", "ubuntustudio", series) |
| 2965 | |
| 2966 | def test_armel(self): |
| 2967 | - self.assertFlavoursEqual("imx51", "armel+imx51", "ubuntu", "jaunty") |
| 2968 | - self.assertFlavoursEqual("imx51", "armel+omap", "ubuntu", "jaunty") |
| 2969 | for series in all_series[10:]: |
| 2970 | self.assertFlavoursEqual( |
| 2971 | "linaro-lt-mx5", "armel+mx5", "ubuntu", series) |
| 2972 | self.assertFlavoursEqual("omap", "armel+omap", "ubuntu", series) |
| 2973 | + self.assertFlavoursEqual("imx51", "armel+imx51", "ubuntu", series) |
| 2974 | |
| 2975 | def test_armhf(self): |
| 2976 | for series in all_series: |
| 2977 | @@ -911,11 +872,8 @@ |
| 2978 | self.assertFlavoursEqual("hppa32 hppa64", "hppa", "ubuntu", series) |
| 2979 | |
| 2980 | def test_i386(self): |
| 2981 | - for series in all_series[:4]: |
| 2982 | - self.assertFlavoursEqual("i386", "i386", "ubuntu", series) |
| 2983 | - for series in all_series[4:15] + all_series[17:]: |
| 2984 | + for series in all_series[4:]: |
| 2985 | self.assertFlavoursEqual("generic", "i386", "ubuntu", series) |
| 2986 | - self.assertFlavoursEqual("generic", "i386", "ubuntu", "precise") |
| 2987 | for series in all_series[4:]: |
| 2988 | self.assertFlavoursEqual("generic", "i386", "xubuntu", series) |
| 2989 | self.assertFlavoursEqual("generic", "i386", "lubuntu", series) |
| 2990 | @@ -926,33 +884,18 @@ |
| 2991 | "lowlatency", "i386", "ubuntustudio", series) |
| 2992 | |
| 2993 | def test_ia64(self): |
| 2994 | - for series in all_series[:4]: |
| 2995 | - self.assertFlavoursEqual( |
| 2996 | - "itanium-smp mckinley-smp", "ia64", "ubuntu", series) |
| 2997 | - for series in all_series[4:10]: |
| 2998 | - self.assertFlavoursEqual( |
| 2999 | - "itanium mckinley", "ia64", "ubuntu", series) |
| 3000 | for series in all_series[10:]: |
| 3001 | self.assertFlavoursEqual("ia64", "ia64", "ubuntu", series) |
| 3002 | |
| 3003 | - def test_lpia(self): |
| 3004 | - for series in all_series: |
| 3005 | - self.assertFlavoursEqual("lpia", "lpia", "ubuntu", series) |
| 3006 | - |
| 3007 | def test_powerpc(self): |
| 3008 | - for series in all_series[:15]: |
| 3009 | - self.assertFlavoursEqual( |
| 3010 | - "powerpc powerpc64-smp", "powerpc", "ubuntu", series) |
| 3011 | for series in all_series[15:24]: |
| 3012 | self.assertFlavoursEqual( |
| 3013 | "powerpc-smp powerpc64-smp", "powerpc", "ubuntu", series) |
| 3014 | for series in all_series[24:]: |
| 3015 | self.assertFlavoursEqual( |
| 3016 | "powerpc-smp generic", "powerpc", "ubuntu", series) |
| 3017 | - self.assertFlavoursEqual("cell", "powerpc+ps3", "ubuntu", "gutsy") |
| 3018 | - for series in all_series[7:15]: |
| 3019 | - self.assertFlavoursEqual( |
| 3020 | - "powerpc powerpc64-smp", "powerpc+ps3", "ubuntu", "hardy") |
| 3021 | + self.assertFlavoursEqual( |
| 3022 | + "powerpc-smp powerpc64-smp", "powerpc+ps3", "ubuntu", "precise") |
| 3023 | |
| 3024 | def test_ppc64el(self): |
| 3025 | for series in all_series: |
| 3026 | @@ -985,20 +928,6 @@ |
| 3027 | self.config["DIST"] = series |
| 3028 | self.assertEqual([], list(live_item_paths(self.config, arch, item))) |
| 3029 | |
| 3030 | - def test_tocd3_fallback(self): |
| 3031 | - for item in ("cloop", "manifest"): |
| 3032 | - self.assertPathsEqual( |
| 3033 | - ["/home/cjwatson/tocd3/livecd.tocd3.%s" % item], |
| 3034 | - "i386", item, "tocd3", "hoary") |
| 3035 | - |
| 3036 | - def test_ubuntu_breezy_fallback(self): |
| 3037 | - for item in ("cloop", "manifest"): |
| 3038 | - for arch in ("amd64", "i386", "powerpc"): |
| 3039 | - self.assertPathsEqual( |
| 3040 | - ["/home/cjwatson/breezy-live/ubuntu/livecd.%s.%s" % |
| 3041 | - (arch, item)], |
| 3042 | - arch, item, "ubuntu", "breezy") |
| 3043 | - |
| 3044 | def test_desktop_items(self): |
| 3045 | for item in ( |
| 3046 | "cloop", "squashfs", "manifest", "manifest-desktop", |
| 3047 | @@ -1019,14 +948,14 @@ |
| 3048 | def test_imgxz(self): |
| 3049 | for item in ("img.xz", "model-assertion"): |
| 3050 | self.assertPathsEqual( |
| 3051 | - ["http://kapok.buildd/~buildd/LiveCD/artful/ubuntu-core/" |
| 3052 | + ["http://kapok.buildd/~buildd/LiveCD/xenial/ubuntu-core/" |
| 3053 | "current/livecd.ubuntu-core.%s" % item], |
| 3054 | - "amd64", item, "ubuntu-core", "artful") |
| 3055 | + "amd64", item, "ubuntu-core", "xenial") |
| 3056 | self.assertPathsEqual( |
| 3057 | - ["http://kishi00.buildd/~buildd/LiveCD/artful/" |
| 3058 | + ["http://kishi00.buildd/~buildd/LiveCD/xenial/" |
| 3059 | "ubuntu-core-raspi2/current/" |
| 3060 | "livecd.ubuntu-core-raspi2.%s" % item], |
| 3061 | - "armhf+raspi2", item, "ubuntu-core", "artful") |
| 3062 | + "armhf+raspi2", item, "ubuntu-core", "xenial") |
| 3063 | |
| 3064 | def test_kernel_items(self): |
| 3065 | for item in ("kernel", "initrd", "bootimg"): |
| 3066 | @@ -1035,14 +964,14 @@ |
| 3067 | ["%s/livecd.kubuntu.%s-generic" % (root, item), |
| 3068 | "%s/livecd.kubuntu.%s-generic-hwe" % (root, item)], |
| 3069 | "amd64", item, "kubuntu", "precise") |
| 3070 | - root = ("http://royal.buildd/~buildd/LiveCD/hardy/ubuntu-ps3/" |
| 3071 | + root = ("http://royal.buildd/~buildd/LiveCD/precise/ubuntu-ps3/" |
| 3072 | "current") |
| 3073 | self.assertPathsEqual( |
| 3074 | - ["%s/livecd.ubuntu-ps3.%s-powerpc" % (root, item), |
| 3075 | + ["%s/livecd.ubuntu-ps3.%s-powerpc-smp" % (root, item), |
| 3076 | "%s/livecd.ubuntu-ps3.%s-powerpc64-smp" % (root, item), |
| 3077 | - "%s/livecd.ubuntu-ps3.%s-powerpc-hwe" % (root, item), |
| 3078 | + "%s/livecd.ubuntu-ps3.%s-powerpc-smp-hwe" % (root, item), |
| 3079 | "%s/livecd.ubuntu-ps3.%s-powerpc64-smp-hwe" % (root, item)], |
| 3080 | - "powerpc+ps3", item, "ubuntu", "hardy") |
| 3081 | + "powerpc+ps3", item, "ubuntu", "precise") |
| 3082 | |
| 3083 | def test_kernel_efi_signed(self): |
| 3084 | self.assertNoPaths("i386", "kernel-efi-signed", "ubuntu", "quantal") |
| 3085 | @@ -1056,21 +985,7 @@ |
| 3086 | ["%s/livecd.ubuntu.kernel-generic.efi.signed" % root], |
| 3087 | "amd64", "kernel-efi-signed", "ubuntu", "quantal") |
| 3088 | |
| 3089 | - # TODO: Since this is only of historical interest, we only test a small |
| 3090 | - # number of cases at the moment. |
| 3091 | - def test_winfoss(self): |
| 3092 | - self.assertNoPaths("i386", "winfoss", "ubuntu", "warty") |
| 3093 | - self.assertNoPaths("powerpc", "winfoss", "ubuntu", "hardy") |
| 3094 | - self.assertPathsEqual( |
| 3095 | - ["http://people.canonical.com/~henrik/winfoss/gutsy/" |
| 3096 | - "ubuntu/current/ubuntu-winfoss-7.10.tar.gz"], |
| 3097 | - "i386", "winfoss", "ubuntu", "karmic") |
| 3098 | - self.assertNoPaths("i386", "winfoss", "ubuntu", "precise") |
| 3099 | - |
| 3100 | def test_wubi(self): |
| 3101 | - for series in all_series[:6]: |
| 3102 | - self.assertNoPaths("amd64", "wubi", "ubuntu", series) |
| 3103 | - self.assertNoPaths("i386", "wubi", "ubuntu", series) |
| 3104 | for series in all_series[6:]: |
| 3105 | path = ("http://people.canonical.com/~ubuntu-archive/wubi/%s/" |
| 3106 | "stable" % series) |
| 3107 | @@ -1079,15 +994,6 @@ |
| 3108 | self.assertNoPaths("i386", "wubi", "xubuntu", "precise") |
| 3109 | self.assertNoPaths("powerpc", "wubi", "ubuntu", "precise") |
| 3110 | |
| 3111 | - def test_umenu(self): |
| 3112 | - for series in all_series[:7] + all_series[8:]: |
| 3113 | - self.assertNoPaths("amd64", "umenu", "ubuntu", series) |
| 3114 | - self.assertNoPaths("i386", "umenu", "ubuntu", series) |
| 3115 | - path = "http://people.canonical.com/~evand/umenu/stable" |
| 3116 | - self.assertPathsEqual([path], "amd64", "umenu", "ubuntu", "hardy") |
| 3117 | - self.assertPathsEqual([path], "i386", "umenu", "ubuntu", "hardy") |
| 3118 | - self.assertNoPaths("powerpc", "umenu", "ubuntu", "hardy") |
| 3119 | - |
| 3120 | def test_usb_creator(self): |
| 3121 | for series in all_series: |
| 3122 | path = ("http://people.canonical.com/~evand/usb-creator/%s/" |
| 3123 | @@ -1118,49 +1024,50 @@ |
| 3124 | |
| 3125 | def test_live_output_directory(self): |
| 3126 | self.config["PROJECT"] = "ubuntu" |
| 3127 | - self.config["DIST"] = "raring" |
| 3128 | + self.config["DIST"] = "trusty" |
| 3129 | self.config["IMAGE_TYPE"] = "daily-live" |
| 3130 | expected = os.path.join( |
| 3131 | - self.temp_dir, "scratch", "ubuntu", "raring", "daily-live", "live") |
| 3132 | + self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live", "live") |
| 3133 | self.assertEqual(expected, live_output_directory(self.config)) |
| 3134 | self.config["UBUNTU_DEFAULTS_LOCALE"] = "zh_CN" |
| 3135 | expected = os.path.join( |
| 3136 | - self.temp_dir, "scratch", "ubuntu-zh_CN", "raring", "daily-live", |
| 3137 | + self.temp_dir, "scratch", "ubuntu-zh_CN", "trusty", "daily-live", |
| 3138 | "live") |
| 3139 | self.assertEqual(expected, live_output_directory(self.config)) |
| 3140 | |
| 3141 | @mock.patch("cdimage.osextras.fetch") |
| 3142 | def test_download_live_items_no_item(self, mock_fetch): |
| 3143 | self.config["PROJECT"] = "ubuntu" |
| 3144 | - self.config["DIST"] = "raring" |
| 3145 | + self.config["DIST"] = "trusty" |
| 3146 | self.config["IMAGE_TYPE"] = "daily-live" |
| 3147 | - self.assertFalse(download_live_items(self.config, "powerpc", "umenu")) |
| 3148 | + self.assertFalse(download_live_items(self.config, "powerpc", |
| 3149 | + "usb-creator")) |
| 3150 | self.assertEqual(0, mock_fetch.call_count) |
| 3151 | |
| 3152 | @mock.patch("cdimage.osextras.fetch", side_effect=osextras.FetchError) |
| 3153 | def test_download_live_items_failed_fetch(self, mock_fetch): |
| 3154 | self.config["PROJECT"] = "ubuntu" |
| 3155 | - self.config["DIST"] = "raring" |
| 3156 | + self.config["DIST"] = "trusty" |
| 3157 | self.config["IMAGE_TYPE"] = "daily-live" |
| 3158 | self.assertFalse(download_live_items(self.config, "i386", "squashfs")) |
| 3159 | mock_fetch.assert_called_once_with( |
| 3160 | self.config, |
| 3161 | - "http://cardamom.buildd/~buildd/LiveCD/raring/ubuntu/current/" |
| 3162 | + "http://cardamom.buildd/~buildd/LiveCD/trusty/ubuntu/current/" |
| 3163 | "livecd.ubuntu.squashfs", |
| 3164 | os.path.join( |
| 3165 | - self.temp_dir, "scratch", "ubuntu", "raring", "daily-live", |
| 3166 | + self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live", |
| 3167 | "live", "i386.squashfs")) |
| 3168 | |
| 3169 | @mock.patch("cdimage.osextras.fetch") |
| 3170 | def test_download_live_items_kernel(self, mock_fetch): |
| 3171 | self.config["PROJECT"] = "ubuntu" |
| 3172 | - self.config["DIST"] = "quantal" |
| 3173 | + self.config["DIST"] = "trusty" |
| 3174 | self.config["IMAGE_TYPE"] = "daily-live" |
| 3175 | self.assertTrue(download_live_items(self.config, "powerpc", "kernel")) |
| 3176 | - prefix = ("http://royal.buildd/~buildd/LiveCD/quantal/ubuntu/current/" |
| 3177 | + prefix = ("http://royal.buildd/~buildd/LiveCD/trusty/ubuntu/current/" |
| 3178 | "livecd.ubuntu.kernel-") |
| 3179 | target_dir = os.path.join( |
| 3180 | - self.temp_dir, "scratch", "ubuntu", "quantal", "daily-live", |
| 3181 | + self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live", |
| 3182 | "live") |
| 3183 | mock_fetch.assert_has_calls([ |
| 3184 | mock.call( |
| 3185 | @@ -1204,15 +1111,15 @@ |
| 3186 | @mock.patch("cdimage.osextras.fetch") |
| 3187 | def test_download_live_items_initrd(self, mock_fetch): |
| 3188 | self.config["PROJECT"] = "ubuntu" |
| 3189 | - self.config["DIST"] = "raring" |
| 3190 | + self.config["DIST"] = "trusty" |
| 3191 | self.config["IMAGE_TYPE"] = "daily-live" |
| 3192 | self.assertTrue(download_live_items(self.config, "i386", "kernel")) |
| 3193 | - prefix = ("http://cardamom.buildd/~buildd/LiveCD/raring/ubuntu/" |
| 3194 | + prefix = ("http://cardamom.buildd/~buildd/LiveCD/trusty/ubuntu/" |
| 3195 | "current/livecd.ubuntu.kernel-") |
| 3196 | calls = [] |
| 3197 | for suffix in '', '-hwe': |
| 3198 | target_dir = os.path.join( |
| 3199 | - self.temp_dir, "scratch", "ubuntu", "raring", "daily-live", |
| 3200 | + self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live", |
| 3201 | "live") |
| 3202 | calls.append( |
| 3203 | mock.call( |
| 3204 | @@ -1223,14 +1130,14 @@ |
| 3205 | @mock.patch("cdimage.osextras.fetch") |
| 3206 | def test_download_live_items_kernel_efi_signed(self, mock_fetch): |
| 3207 | self.config["PROJECT"] = "ubuntu" |
| 3208 | - self.config["DIST"] = "raring" |
| 3209 | + self.config["DIST"] = "trusty" |
| 3210 | self.config["IMAGE_TYPE"] = "daily-live" |
| 3211 | self.assertTrue( |
| 3212 | download_live_items(self.config, "amd64", "kernel-efi-signed")) |
| 3213 | - prefix = ("http://kapok.buildd/~buildd/LiveCD/raring/ubuntu/" |
| 3214 | + prefix = ("http://kapok.buildd/~buildd/LiveCD/trusty/ubuntu/" |
| 3215 | "current/livecd.ubuntu.kernel-") |
| 3216 | target_dir = os.path.join( |
| 3217 | - self.temp_dir, "scratch", "ubuntu", "raring", "daily-live", "live") |
| 3218 | + self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live", "live") |
| 3219 | mock_fetch.assert_called_once_with( |
| 3220 | self.config, prefix + "generic.efi.signed", |
| 3221 | os.path.join(target_dir, "amd64.kernel-generic.efi.signed")) |
| 3222 | @@ -1238,16 +1145,16 @@ |
| 3223 | @mock.patch("cdimage.osextras.fetch") |
| 3224 | def test_download_live_items_bootimg(self, mock_fetch): |
| 3225 | self.config["PROJECT"] = "ubuntu" |
| 3226 | - self.config["DIST"] = "raring" |
| 3227 | + self.config["DIST"] = "trusty" |
| 3228 | self.config["IMAGE_TYPE"] = "daily-preinstalled" |
| 3229 | self.assertTrue( |
| 3230 | download_live_items(self.config, "armhf+omap4", "bootimg")) |
| 3231 | - url = ("http://kishi00.buildd/~buildd/LiveCD/raring/ubuntu-omap4/" |
| 3232 | + url = ("http://kishi00.buildd/~buildd/LiveCD/trusty/ubuntu-omap4/" |
| 3233 | "current/livecd.ubuntu-omap4.bootimg-omap4") |
| 3234 | calls = [] |
| 3235 | for suffix in '', '-hwe': |
| 3236 | target_dir = os.path.join( |
| 3237 | - self.temp_dir, "scratch", "ubuntu", "raring", |
| 3238 | + self.temp_dir, "scratch", "ubuntu", "trusty", |
| 3239 | "daily-preinstalled", "live") |
| 3240 | calls.append( |
| 3241 | mock.call( |
| 3242 | @@ -1259,77 +1166,52 @@ |
| 3243 | @mock.patch("cdimage.osextras.fetch") |
| 3244 | def test_download_live_items_wubi(self, mock_fetch): |
| 3245 | self.config["PROJECT"] = "ubuntu" |
| 3246 | - self.config["DIST"] = "raring" |
| 3247 | + self.config["DIST"] = "trusty" |
| 3248 | self.config["IMAGE_TYPE"] = "daily-live" |
| 3249 | self.assertTrue(download_live_items(self.config, "i386", "wubi")) |
| 3250 | - url = "http://people.canonical.com/~ubuntu-archive/wubi/raring/stable" |
| 3251 | + url = "http://people.canonical.com/~ubuntu-archive/wubi/trusty/stable" |
| 3252 | target_dir = os.path.join( |
| 3253 | - self.temp_dir, "scratch", "ubuntu", "raring", "daily-live", "live") |
| 3254 | + self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live", "live") |
| 3255 | mock_fetch.assert_called_once_with( |
| 3256 | self.config, url, os.path.join(target_dir, "i386.wubi.exe")) |
| 3257 | |
| 3258 | @mock.patch("cdimage.osextras.fetch") |
| 3259 | - def test_download_live_items_umenu(self, mock_fetch): |
| 3260 | - self.config["PROJECT"] = "ubuntu" |
| 3261 | - self.config["DIST"] = "hardy" |
| 3262 | - self.config["IMAGE_TYPE"] = "daily-live" |
| 3263 | - self.assertTrue(download_live_items(self.config, "i386", "umenu")) |
| 3264 | - url = "http://people.canonical.com/~evand/umenu/stable" |
| 3265 | - target_dir = os.path.join( |
| 3266 | - self.temp_dir, "scratch", "ubuntu", "hardy", "daily-live", "live") |
| 3267 | - mock_fetch.assert_called_once_with( |
| 3268 | - self.config, url, os.path.join(target_dir, "i386.umenu.exe")) |
| 3269 | - |
| 3270 | - @mock.patch("cdimage.osextras.fetch") |
| 3271 | def test_download_live_items_usb_creator(self, mock_fetch): |
| 3272 | self.config["PROJECT"] = "ubuntu" |
| 3273 | - self.config["DIST"] = "raring" |
| 3274 | + self.config["DIST"] = "trusty" |
| 3275 | self.config["IMAGE_TYPE"] = "daily-live" |
| 3276 | self.assertTrue( |
| 3277 | download_live_items(self.config, "i386", "usb-creator")) |
| 3278 | - url = "http://people.canonical.com/~evand/usb-creator/raring/stable" |
| 3279 | + url = "http://people.canonical.com/~evand/usb-creator/trusty/stable" |
| 3280 | target_dir = os.path.join( |
| 3281 | - self.temp_dir, "scratch", "ubuntu", "raring", "daily-live", "live") |
| 3282 | + self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live", "live") |
| 3283 | mock_fetch.assert_called_once_with( |
| 3284 | self.config, url, os.path.join(target_dir, "i386.usb-creator.exe")) |
| 3285 | |
| 3286 | @mock.patch("cdimage.osextras.fetch") |
| 3287 | - def test_download_live_items_winfoss(self, mock_fetch): |
| 3288 | - self.config["PROJECT"] = "ubuntu" |
| 3289 | - self.config["DIST"] = "gutsy" |
| 3290 | - self.config["IMAGE_TYPE"] = "daily-live" |
| 3291 | - self.assertTrue(download_live_items(self.config, "i386", "winfoss")) |
| 3292 | - url = ("http://people.canonical.com/~henrik/winfoss/gutsy/ubuntu/" |
| 3293 | - "current/ubuntu-winfoss-7.10.tar.gz") |
| 3294 | - target_dir = os.path.join( |
| 3295 | - self.temp_dir, "scratch", "ubuntu", "gutsy", "daily-live", "live") |
| 3296 | - mock_fetch.assert_called_once_with( |
| 3297 | - self.config, url, os.path.join(target_dir, "i386.winfoss.tgz")) |
| 3298 | - |
| 3299 | - @mock.patch("cdimage.osextras.fetch") |
| 3300 | def test_download_live_items_squashfs(self, mock_fetch): |
| 3301 | self.config["PROJECT"] = "ubuntu" |
| 3302 | - self.config["DIST"] = "raring" |
| 3303 | + self.config["DIST"] = "trusty" |
| 3304 | self.config["IMAGE_TYPE"] = "daily-live" |
| 3305 | self.assertTrue(download_live_items(self.config, "i386", "squashfs")) |
| 3306 | - url = ("http://cardamom.buildd/~buildd/LiveCD/raring/ubuntu/" |
| 3307 | + url = ("http://cardamom.buildd/~buildd/LiveCD/trusty/ubuntu/" |
| 3308 | "current/livecd.ubuntu.squashfs") |
| 3309 | target_dir = os.path.join( |
| 3310 | - self.temp_dir, "scratch", "ubuntu", "raring", "daily-live", "live") |
| 3311 | + self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live", "live") |
| 3312 | mock_fetch.assert_called_once_with( |
| 3313 | self.config, url, os.path.join(target_dir, "i386.squashfs")) |
| 3314 | |
| 3315 | @mock.patch("cdimage.osextras.fetch") |
| 3316 | def test_download_live_items_server_squashfs(self, mock_fetch): |
| 3317 | self.config["PROJECT"] = "edubuntu" |
| 3318 | - self.config["DIST"] = "raring" |
| 3319 | + self.config["DIST"] = "trusty" |
| 3320 | self.config["IMAGE_TYPE"] = "dvd" |
| 3321 | self.assertTrue( |
| 3322 | download_live_items(self.config, "i386", "server-squashfs")) |
| 3323 | - url = ("http://cardamom.buildd/~buildd/LiveCD/raring/ubuntu-server/" |
| 3324 | + url = ("http://cardamom.buildd/~buildd/LiveCD/trusty/ubuntu-server/" |
| 3325 | "current/livecd.ubuntu-server.squashfs") |
| 3326 | target_dir = os.path.join( |
| 3327 | - self.temp_dir, "scratch", "edubuntu", "raring", "dvd", "live") |
| 3328 | + self.temp_dir, "scratch", "edubuntu", "trusty", "dvd", "live") |
| 3329 | mock_fetch.assert_called_once_with( |
| 3330 | self.config, url, os.path.join(target_dir, "i386.server-squashfs")) |
| 3331 | |
| 3332 | @@ -1377,10 +1259,10 @@ |
| 3333 | |
| 3334 | def test_write_autorun(self): |
| 3335 | self.config["PROJECT"] = "ubuntu" |
| 3336 | - self.config["DIST"] = "raring" |
| 3337 | + self.config["DIST"] = "trusty" |
| 3338 | self.config["IMAGE_TYPE"] = "daily-live" |
| 3339 | output_dir = os.path.join( |
| 3340 | - self.temp_dir, "scratch", "ubuntu", "raring", "daily-live", "live") |
| 3341 | + self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live", "live") |
| 3342 | os.makedirs(output_dir) |
| 3343 | write_autorun(self.config, "i386", "wubi.exe", "Install Ubuntu") |
| 3344 | autorun_path = os.path.join(output_dir, "i386.autorun.inf") |
| 3345 | @@ -1413,13 +1295,13 @@ |
| 3346 | |
| 3347 | mock_fetch.side_effect = fetch_side_effect |
| 3348 | self.config["PROJECT"] = "ubuntu" |
| 3349 | - self.config["DIST"] = "raring" |
| 3350 | + self.config["DIST"] = "trusty" |
| 3351 | self.config["IMAGE_TYPE"] = "daily-live" |
| 3352 | self.config["ARCHES"] = "amd64 i386" |
| 3353 | self.config["CDIMAGE_LIVE"] = "1" |
| 3354 | download_live_filesystems(self.config) |
| 3355 | output_dir = os.path.join( |
| 3356 | - self.temp_dir, "scratch", "ubuntu", "raring", "daily-live", "live") |
| 3357 | + self.temp_dir, "scratch", "ubuntu", "trusty", "daily-live", "live") |
| 3358 | self.assertCountEqual([ |
| 3359 | "amd64.autorun.inf", |
| 3360 | "amd64.initrd-generic", |
| 3361 | |
| 3362 | === modified file 'lib/cdimage/tests/test_mirror.py' |
| 3363 | --- lib/cdimage/tests/test_mirror.py 2015-12-08 13:17:26 +0000 |
| 3364 | +++ lib/cdimage/tests/test_mirror.py 2019-02-28 22:59:07 +0000 |
| 3365 | @@ -66,10 +66,6 @@ |
| 3366 | for series in all_series: |
| 3367 | self.assertMirrorEqual("ftp", "i386", series) |
| 3368 | |
| 3369 | - def test_lpia(self): |
| 3370 | - for series in all_series: |
| 3371 | - self.assertMirrorEqual("ftp", "lpia", series) |
| 3372 | - |
| 3373 | def test_powerpc(self): |
| 3374 | for series in all_series: |
| 3375 | self.assertMirrorEqual("ftp", "powerpc", series) |
| 3376 | |
| 3377 | === modified file 'lib/cdimage/tests/test_tree.py' |
| 3378 | --- lib/cdimage/tests/test_tree.py 2019-02-27 21:21:04 +0000 |
| 3379 | +++ lib/cdimage/tests/test_tree.py 2019-02-28 22:59:07 +0000 |
| 3380 | @@ -247,44 +247,26 @@ |
| 3381 | |
| 3382 | def test_publish_type(self): |
| 3383 | for image_type, project, dist, publish_type in ( |
| 3384 | - ("daily-preinstalled", "ubuntu-netbook", "precise", |
| 3385 | - "preinstalled-netbook"), |
| 3386 | - ("daily-preinstalled", "ubuntu-headless", "precise", |
| 3387 | - "preinstalled-headless"), |
| 3388 | ("daily-preinstalled", "ubuntu-server", "precise", |
| 3389 | "preinstalled-server"), |
| 3390 | ("daily-preinstalled", "ubuntu-server", "xenial", |
| 3391 | "preinstalled-server"), |
| 3392 | ("daily-preinstalled", "ubuntu", "precise", |
| 3393 | "preinstalled-desktop"), |
| 3394 | - ("daily-preinstalled", "ubuntu-touch", "saucy", |
| 3395 | - "preinstalled-touch"), |
| 3396 | - ("daily-preinstalled", "ubuntu-touch-custom", "vivid", |
| 3397 | - "preinstalled-touch"), |
| 3398 | - ("daily-live", "edubuntu", "edgy", "live"), |
| 3399 | - ("daily-live", "edubuntu", "feisty", "desktop"), |
| 3400 | - ("daily-live", "kubuntu-netbook", "lucid", "netbook"), |
| 3401 | - ("daily-live", "kubuntu-plasma5", "utopic", "desktop"), |
| 3402 | - ("daily-live", "ubuntu-mid", "lucid", "mid"), |
| 3403 | - ("daily-live", "ubuntu-moblin-remix", "lucid", "moblin-remix"), |
| 3404 | - ("daily-live", "ubuntu-netbook", "hardy", "netbook"), |
| 3405 | - ("daily-live", "ubuntu-server", "hardy", "live-server"), |
| 3406 | - ("daily-live", "ubuntu", "breezy", "live"), |
| 3407 | - ("daily-live", "ubuntu", "dapper", "desktop"), |
| 3408 | - ("daily-live", "ubuntu-zh_CN", "raring", "desktop"), |
| 3409 | + ("daily-preinstalled", "ubuntu-touch", "trusty", |
| 3410 | + "preinstalled-touch"), |
| 3411 | + ("daily-live", "edubuntu", "precise", "desktop"), |
| 3412 | + ("daily-live", "kubuntu-netbook", "precise", "netbook"), |
| 3413 | + ("daily-live", "ubuntu-server", "precise", "live-server"), |
| 3414 | + ("daily-live", "ubuntu", "precise", "desktop"), |
| 3415 | + ("daily-live", "ubuntu-zh_CN", "trusty", "desktop"), |
| 3416 | ("daily-live", "ubuntu-core", "xenial", "live-core"), |
| 3417 | - ("ports_dvd", "ubuntu", "hardy", "dvd"), |
| 3418 | - ("dvd", "kubuntu", "hardy", "dvd"), |
| 3419 | - ("daily", "edubuntu", "edgy", "install"), |
| 3420 | - ("daily", "edubuntu", "feisty", "server"), |
| 3421 | - ("daily", "edubuntu", "gutsy", "server"), |
| 3422 | - ("daily", "edubuntu", "hardy", "addon"), |
| 3423 | - ("daily", "jeos", "hardy", "jeos"), |
| 3424 | + ("ports_dvd", "ubuntu", "precise", "dvd"), |
| 3425 | + ("dvd", "kubuntu", "precise", "dvd"), |
| 3426 | + ("daily", "edubuntu", "precise", "addon"), |
| 3427 | ("daily", "ubuntu-base", "precise", "base"), |
| 3428 | - ("daily", "ubuntu-server", "breezy", "install"), |
| 3429 | - ("daily", "ubuntu-server", "dapper", "server"), |
| 3430 | - ("daily", "ubuntu", "breezy", "install"), |
| 3431 | - ("daily", "ubuntu", "dapper", "alternate"), |
| 3432 | + ("daily", "ubuntu-server", "precise", "server"), |
| 3433 | + ("daily", "ubuntu", "precise", "alternate"), |
| 3434 | ): |
| 3435 | self.config["PROJECT"] = project |
| 3436 | self.config["DIST"] = dist |
| 3437 | @@ -318,8 +300,6 @@ |
| 3438 | for project, expected in ( |
| 3439 | ("ubuntu", [assets + "/vanilla-framework-version-1.8.0.min.css"]), |
| 3440 | ("kubuntu", ["//releases.ubuntu.com/include/kubuntu.css"]), |
| 3441 | - ("kubuntu-plasma5", |
| 3442 | - ["//releases.ubuntu.com/include/kubuntu-plasma5.css"]), |
| 3443 | ("lubuntu", |
| 3444 | ["//cdimage.ubuntu.com/include/lubuntu/style.css"]), |
| 3445 | ("lubuntu-next", |
| 3446 | @@ -330,7 +310,7 @@ |
| 3447 | self.assertEqual(expected, publisher.cssincludes()) |
| 3448 | |
| 3449 | def test_cdtypestr(self): |
| 3450 | - self.config["DIST"] = "quantal" |
| 3451 | + self.config["DIST"] = "trusty" |
| 3452 | publisher = Publisher(self.tree, "daily-live") |
| 3453 | self.assertEqual( |
| 3454 | "desktop image", publisher.cdtypestr("desktop", "iso")) |
| 3455 | @@ -338,7 +318,7 @@ |
| 3456 | def test_cdtypedesc_desktop(self): |
| 3457 | self.config["PROJECT"] = "ubuntu" |
| 3458 | self.config["CAPPROJECT"] = "Ubuntu" |
| 3459 | - self.config["DIST"] = "quantal" |
| 3460 | + self.config["DIST"] = "trusty" |
| 3461 | publisher = Publisher(self.tree, "daily-live") |
| 3462 | desc = list(publisher.cdtypedesc("desktop", "iso")) |
| 3463 | self.assertEqual( |
| 3464 | @@ -358,7 +338,7 @@ |
| 3465 | def test_cdtypedesc_alternate(self): |
| 3466 | self.config["PROJECT"] = "ubuntu" |
| 3467 | self.config["CAPPROJECT"] = "Ubuntu" |
| 3468 | - self.config["DIST"] = "quantal" |
| 3469 | + self.config["DIST"] = "trusty" |
| 3470 | publisher = Publisher(self.tree, "daily") |
| 3471 | desc = list(publisher.cdtypedesc("alternate", "iso")) |
| 3472 | self.assertEqual( |
| 3473 | @@ -452,30 +432,30 @@ |
| 3474 | def test_find_images(self): |
| 3475 | for name in ( |
| 3476 | "MD5SUMS", |
| 3477 | - "raring-desktop-amd64.iso", "raring-desktop-amd64.list", |
| 3478 | - "raring-desktop-i386.iso", "raring-desktop-i386.list", |
| 3479 | + "trusty-desktop-amd64.iso", "trusty-desktop-amd64.list", |
| 3480 | + "trusty-desktop-i386.iso", "trusty-desktop-i386.list", |
| 3481 | ): |
| 3482 | touch(os.path.join(self.directory, name)) |
| 3483 | publisher = Publisher(self.tree, "daily-live") |
| 3484 | self.assertCountEqual( |
| 3485 | - ["raring-desktop-amd64.list", "raring-desktop-i386.list"], |
| 3486 | - publisher.find_images(self.directory, "raring", "desktop")) |
| 3487 | + ["trusty-desktop-amd64.list", "trusty-desktop-i386.list"], |
| 3488 | + publisher.find_images(self.directory, "trusty", "desktop")) |
| 3489 | |
| 3490 | def test_find_source_images(self): |
| 3491 | for name in ( |
| 3492 | "MD5SUMS", |
| 3493 | - "raring-src-1.iso", "raring-src-2.iso", "raring-src-3.iso", |
| 3494 | + "trusty-src-1.iso", "trusty-src-2.iso", "trusty-src-3.iso", |
| 3495 | ): |
| 3496 | touch(os.path.join(self.directory, name)) |
| 3497 | publisher = Publisher(self.tree, "daily-live") |
| 3498 | self.assertEqual( |
| 3499 | - [1, 2, 3], publisher.find_source_images(self.directory, "raring")) |
| 3500 | + [1, 2, 3], publisher.find_source_images(self.directory, "trusty")) |
| 3501 | |
| 3502 | def test_find_any_with_extension(self): |
| 3503 | for name in ( |
| 3504 | "MD5SUMS", |
| 3505 | - "raring-desktop-amd64.iso", "raring-desktop-amd64.iso.torrent", |
| 3506 | - "raring-desktop-i386.iso", "raring-desktop-i386.list", |
| 3507 | + "trusty-desktop-amd64.iso", "trusty-desktop-amd64.iso.torrent", |
| 3508 | + "trusty-desktop-i386.iso", "trusty-desktop-i386.list", |
| 3509 | ): |
| 3510 | touch(os.path.join(self.directory, name)) |
| 3511 | publisher = Publisher(self.tree, "daily-live") |
| 3512 | @@ -496,21 +476,21 @@ |
| 3513 | # upgrading to XHTML so that we can use an XML parser. |
| 3514 | self.config["PROJECT"] = "ubuntu" |
| 3515 | self.config["CAPPROJECT"] = "Ubuntu" |
| 3516 | - self.config["DIST"] = "raring" |
| 3517 | + self.config["DIST"] = "trusty" |
| 3518 | for name in ( |
| 3519 | "MD5SUMS", |
| 3520 | - "raring-desktop-amd64.iso", "raring-desktop-amd64.iso.zsync", |
| 3521 | - "raring-desktop-i386.iso", "raring-desktop-i386.list", |
| 3522 | + "trusty-desktop-amd64.iso", "trusty-desktop-amd64.iso.zsync", |
| 3523 | + "trusty-desktop-i386.iso", "trusty-desktop-i386.list", |
| 3524 | ): |
| 3525 | touch(os.path.join(self.directory, name)) |
| 3526 | publisher = Publisher(self.tree, "daily-live") |
| 3527 | - publisher.make_web_indices(self.directory, "raring", status="daily") |
| 3528 | + publisher.make_web_indices(self.directory, "trusty", status="daily") |
| 3529 | |
| 3530 | self.assertCountEqual([ |
| 3531 | "HEADER.html", "FOOTER.html", ".htaccess", |
| 3532 | "MD5SUMS", |
| 3533 | - "raring-desktop-amd64.iso", "raring-desktop-amd64.iso.zsync", |
| 3534 | - "raring-desktop-i386.iso", "raring-desktop-i386.list", |
| 3535 | + "trusty-desktop-amd64.iso", "trusty-desktop-amd64.iso.zsync", |
| 3536 | + "trusty-desktop-i386.iso", "trusty-desktop-i386.list", |
| 3537 | ], os.listdir(self.directory)) |
| 3538 | |
| 3539 | header_path = os.path.join(self.directory, "HEADER.html") |
| 3540 | @@ -533,13 +513,13 @@ |
| 3541 | self.assertEqual( |
| 3542 | "AddDescription \"Desktop image for 64-bit PC (AMD64) " |
| 3543 | "computers (<a href=\\\"http://zsync.moria.org.uk/\\\">" |
| 3544 | - "zsync</a> metafile)\" raring-desktop-amd64.iso.zsync\n" |
| 3545 | + "zsync</a> metafile)\" trusty-desktop-amd64.iso.zsync\n" |
| 3546 | "AddDescription \"Desktop image for 64-bit PC (AMD64) " |
| 3547 | - "computers (standard download)\" raring-desktop-amd64.iso\n" |
| 3548 | - "AddDescription \"Desktop image for 32-bit PC (i386) " |
| 3549 | - "computers (standard download)\" raring-desktop-i386.iso\n" |
| 3550 | - "AddDescription \"Desktop image for 32-bit PC (i386) " |
| 3551 | - "computers (file listing)\" raring-desktop-i386.list\n" |
| 3552 | + "computers (standard download)\" trusty-desktop-amd64.iso\n" |
| 3553 | + "AddDescription \"Desktop image for 32-bit PC (i386) " |
| 3554 | + "computers (standard download)\" trusty-desktop-i386.iso\n" |
| 3555 | + "AddDescription \"Desktop image for 32-bit PC (i386) " |
| 3556 | + "computers (file listing)\" trusty-desktop-i386.list\n" |
| 3557 | "\n" |
| 3558 | "HeaderName HEADER.html\n" |
| 3559 | "ReadmeName FOOTER.html\n" |
| 3560 | @@ -739,35 +719,24 @@ |
| 3561 | ("edubuntu", None, "daily-preinstalled", "i386", 4700372992), |
| 3562 | ("edubuntu", None, "dvd", "i386", 4700372992), |
| 3563 | ("ubuntustudio", None, "dvd", "i386", 4700372992), |
| 3564 | - ("ubuntu-mid", None, "daily-live", "i386", 1073741824), |
| 3565 | - ("ubuntu-moblin-remix", None, "daily-live", "i386", 1073741824), |
| 3566 | ("kubuntu", "trusty", "daily-live", "i386", 1283457024), |
| 3567 | ("kubuntu", "xenial", "daily-live", "i386", 2000000000), |
| 3568 | ("kubuntu-active", "trusty", "daily-live", "i386", 1283457024), |
| 3569 | ("kubuntu-active", "xenial", "daily-live", "i386", 2000000000), |
| 3570 | - ("kubuntu-plasma5", "trusty", "daily-live", "i386", 1283457024), |
| 3571 | - ("kubuntu-plasma5", "xenial", "daily-live", "i386", 2000000000), |
| 3572 | ("ubuntu", None, "dvd", "i386", 4700372992), |
| 3573 | ("ubuntu", "precise", "daily-live", "i386", 736665600), |
| 3574 | - ("ubuntu", "quantal", "daily-live", "i386", 801000000), |
| 3575 | - ("ubuntu", "raring", "daily-live", "i386", 835000000), |
| 3576 | - ("ubuntu", "raring", "daily-live", "powerpc", 850000000), |
| 3577 | - ("ubuntu", "saucy", "daily-live", "i386", 950000000), |
| 3578 | - ("ubuntu", "saucy", "daily-live", "powerpc", 950000000), |
| 3579 | ("ubuntu", "trusty", "daily-live", "i386", 1200000000), |
| 3580 | ("ubuntu", "trusty", "daily-live", "powerpc", 1200000000), |
| 3581 | ("ubuntu", "xenial", "daily-live", "i386", 2000000000), |
| 3582 | - ("xubuntu", "quantal", "daily-live", "i386", 736665600), |
| 3583 | - ("xubuntu", "raring", "daily-live", "i386", 1073741824), |
| 3584 | ("xubuntu", "xenial", "daily-live", "i386", 2000000000), |
| 3585 | - ("ubuntu-gnome", "saucy", "daily-live", "i386", 1073741824), |
| 3586 | + ("ubuntu-gnome", "trusty", "daily-live", "i386", 1073741824), |
| 3587 | ("ubuntu-gnome", "xenial", "daily-live", "i386", 2000000000), |
| 3588 | - ("ubuntu-budgie", "zesty", "daily-live", "i386", 2000000000), |
| 3589 | + ("ubuntu-budgie", "bionic", "daily-live", "i386", 2000000000), |
| 3590 | ("ubuntu-mate", "trusty", "daily-live", "amd64", 1073741824), |
| 3591 | ("ubuntu-mate", "xenial", "daily-live", "amd64", 2000000000), |
| 3592 | ("ubuntu-server", "xenial", "daily", "amd64", 1073741824), |
| 3593 | - ("ubuntu-server", "zesty", "daily", "amd64", 736665600), |
| 3594 | - ("ubuntu-server", "zesty", "daily", "ppc64el", 1073741824), |
| 3595 | + ("ubuntu-server", "bionic", "daily", "amd64", 1073741824), |
| 3596 | + ("ubuntu-server", "bionic", "daily", "ppc64el", 1073741824), |
| 3597 | ): |
| 3598 | if dist is not None: |
| 3599 | self.config["DIST"] = dist |
| 3600 | @@ -843,27 +812,21 @@ |
| 3601 | |
| 3602 | def test_jigdo_ports_powerpc(self): |
| 3603 | publisher = self.make_publisher("ubuntu", "daily") |
| 3604 | - for series in all_series[:5]: |
| 3605 | - publisher.config["DIST"] = series |
| 3606 | - self.assertFalse(publisher.jigdo_ports("powerpc")) |
| 3607 | for series in all_series[5:]: |
| 3608 | publisher.config["DIST"] = series |
| 3609 | self.assertTrue(publisher.jigdo_ports("powerpc")) |
| 3610 | |
| 3611 | def test_jigdo_ports_sparc(self): |
| 3612 | publisher = self.make_publisher("ubuntu", "daily") |
| 3613 | - for series in all_series[:3] + all_series[7:]: |
| 3614 | + for series in all_series[7:]: |
| 3615 | publisher.config["DIST"] = series |
| 3616 | self.assertTrue(publisher.jigdo_ports("sparc")) |
| 3617 | - for series in all_series[3:7]: |
| 3618 | - publisher.config["DIST"] = series |
| 3619 | - self.assertFalse(publisher.jigdo_ports("sparc")) |
| 3620 | |
| 3621 | def test_jigdo_ports(self): |
| 3622 | publisher = self.make_publisher("ubuntu", "daily") |
| 3623 | for arch in ("amd64", "i386"): |
| 3624 | self.assertFalse(publisher.jigdo_ports(arch)) |
| 3625 | - for arch in ("armel", "armhf", "hppa", "ia64", "lpia", "ppc64el", |
| 3626 | + for arch in ("armel", "armhf", "hppa", "ia64", "ppc64el", |
| 3627 | "s390x"): |
| 3628 | self.assertTrue(publisher.jigdo_ports(arch)) |
| 3629 | |
| 3630 | @@ -921,7 +884,7 @@ |
| 3631 | return_value="img.xz") |
| 3632 | @mock.patch("cdimage.tree.zsyncmake") |
| 3633 | def test_publish_core_binary(self, mock_zsyncmake, *args): |
| 3634 | - self.config["DIST"] = "artful" |
| 3635 | + self.config["DIST"] = "xenial" |
| 3636 | publisher = self.make_publisher("ubuntu-core", "daily-live") |
| 3637 | source_dir = publisher.image_output("amd64") |
| 3638 | touch(os.path.join( |
| 3639 | @@ -1025,17 +988,17 @@ |
| 3640 | os.readlink(os.path.join(publisher.publish_base, "current"))) |
| 3641 | |
| 3642 | def test_published_images(self): |
| 3643 | - self.config["DIST"] = "raring" |
| 3644 | + self.config["DIST"] = "trusty" |
| 3645 | publisher = self.make_publisher("ubuntu", "daily-live") |
| 3646 | target_dir = os.path.join(publisher.publish_base, "20130321") |
| 3647 | for name in ( |
| 3648 | "MD5SUMS", |
| 3649 | - "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest", |
| 3650 | - "raring-desktop-i386.iso", "raring-desktop-i386.manifest", |
| 3651 | + "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest", |
| 3652 | + "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest", |
| 3653 | ): |
| 3654 | touch(os.path.join(target_dir, name)) |
| 3655 | self.assertEqual( |
| 3656 | - set(["raring-desktop-amd64.iso", "raring-desktop-i386.iso"]), |
| 3657 | + set(["trusty-desktop-amd64.iso", "trusty-desktop-i386.iso"]), |
| 3658 | publisher.published_images("20130321")) |
| 3659 | |
| 3660 | def test_published_core_images(self): |
| 3661 | @@ -1057,12 +1020,12 @@ |
| 3662 | |
| 3663 | @mock.patch("cdimage.tree.DailyTreePublisher.polish_directory") |
| 3664 | def test_mark_current_missing_to_single(self, mock_polish_directory): |
| 3665 | - self.config["DIST"] = "raring" |
| 3666 | + self.config["DIST"] = "trusty" |
| 3667 | publisher = self.make_publisher("ubuntu", "daily-live") |
| 3668 | target_dir = os.path.join(publisher.publish_base, "20130321") |
| 3669 | for name in ( |
| 3670 | - "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest", |
| 3671 | - "raring-desktop-i386.iso", "raring-desktop-i386.manifest", |
| 3672 | + "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest", |
| 3673 | + "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest", |
| 3674 | ): |
| 3675 | touch(os.path.join(target_dir, name)) |
| 3676 | publisher.mark_current("20130321", ["amd64", "i386"]) |
| 3677 | @@ -1073,13 +1036,13 @@ |
| 3678 | |
| 3679 | @mock.patch("cdimage.tree.DailyTreePublisher.polish_directory") |
| 3680 | def test_mark_current_missing_to_mixed(self, mock_polish_directory): |
| 3681 | - self.config["DIST"] = "raring" |
| 3682 | + self.config["DIST"] = "trusty" |
| 3683 | publisher = self.make_publisher("ubuntu", "daily-live") |
| 3684 | target_dir = os.path.join(publisher.publish_base, "20130321") |
| 3685 | for name in ( |
| 3686 | "MD5SUMS", |
| 3687 | - "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest", |
| 3688 | - "raring-desktop-i386.iso", "raring-desktop-i386.manifest", |
| 3689 | + "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest", |
| 3690 | + "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest", |
| 3691 | ): |
| 3692 | touch(os.path.join(target_dir, name)) |
| 3693 | publisher.mark_current("20130321", ["amd64"]) |
| 3694 | @@ -1087,10 +1050,10 @@ |
| 3695 | self.assertFalse(os.path.islink(publish_current)) |
| 3696 | self.assertTrue(os.path.isdir(publish_current)) |
| 3697 | self.assertCountEqual( |
| 3698 | - ["raring-desktop-amd64.iso", "raring-desktop-amd64.manifest"], |
| 3699 | + ["trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest"], |
| 3700 | os.listdir(publish_current)) |
| 3701 | for name in ( |
| 3702 | - "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest", |
| 3703 | + "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest", |
| 3704 | ): |
| 3705 | path = os.path.join(publish_current, name) |
| 3706 | self.assertTrue(os.path.islink(path)) |
| 3707 | @@ -1101,12 +1064,12 @@ |
| 3708 | |
| 3709 | @mock.patch("cdimage.tree.DailyTreePublisher.polish_directory") |
| 3710 | def test_mark_current_single_to_single(self, mock_polish_directory): |
| 3711 | - self.config["DIST"] = "raring" |
| 3712 | + self.config["DIST"] = "trusty" |
| 3713 | publisher = self.make_publisher("ubuntu", "daily-live") |
| 3714 | for date in "20130320", "20130321": |
| 3715 | for name in ( |
| 3716 | - "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest", |
| 3717 | - "raring-desktop-i386.iso", "raring-desktop-i386.manifest", |
| 3718 | + "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest", |
| 3719 | + "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest", |
| 3720 | ): |
| 3721 | touch(os.path.join(publisher.publish_base, date, name)) |
| 3722 | publish_current = os.path.join(publisher.publish_base, "current") |
| 3723 | @@ -1118,13 +1081,13 @@ |
| 3724 | |
| 3725 | @mock.patch("cdimage.tree.DailyTreePublisher.polish_directory") |
| 3726 | def test_mark_current_single_to_mixed(self, mock_polish_directory): |
| 3727 | - self.config["DIST"] = "raring" |
| 3728 | + self.config["DIST"] = "trusty" |
| 3729 | publisher = self.make_publisher("ubuntu", "daily-live") |
| 3730 | for date in "20130320", "20130321": |
| 3731 | for name in ( |
| 3732 | "MD5SUMS", |
| 3733 | - "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest", |
| 3734 | - "raring-desktop-i386.iso", "raring-desktop-i386.manifest", |
| 3735 | + "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest", |
| 3736 | + "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest", |
| 3737 | ): |
| 3738 | touch(os.path.join(publisher.publish_base, date, name)) |
| 3739 | publish_current = os.path.join(publisher.publish_base, "current") |
| 3740 | @@ -1133,13 +1096,13 @@ |
| 3741 | self.assertFalse(os.path.islink(publish_current)) |
| 3742 | self.assertTrue(os.path.isdir(publish_current)) |
| 3743 | self.assertCountEqual([ |
| 3744 | - "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest", |
| 3745 | - "raring-desktop-i386.iso", "raring-desktop-i386.manifest", |
| 3746 | + "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest", |
| 3747 | + "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest", |
| 3748 | ], os.listdir(publish_current)) |
| 3749 | for date, arch in (("20130320", "i386"), ("20130321", "amd64")): |
| 3750 | for name in ( |
| 3751 | - "raring-desktop-%s.iso" % arch, |
| 3752 | - "raring-desktop-%s.manifest" % arch, |
| 3753 | + "trusty-desktop-%s.iso" % arch, |
| 3754 | + "trusty-desktop-%s.manifest" % arch, |
| 3755 | ): |
| 3756 | path = os.path.join(publish_current, name) |
| 3757 | self.assertTrue(os.path.islink(path)) |
| 3758 | @@ -1153,21 +1116,21 @@ |
| 3759 | |
| 3760 | @mock.patch("cdimage.tree.DailyTreePublisher.polish_directory") |
| 3761 | def test_mark_current_mixed_to_single(self, mock_polish_directory): |
| 3762 | - self.config["DIST"] = "raring" |
| 3763 | + self.config["DIST"] = "trusty" |
| 3764 | publisher = self.make_publisher("ubuntu", "daily-live") |
| 3765 | for date in "20130320", "20130321": |
| 3766 | for name in ( |
| 3767 | "MD5SUMS", |
| 3768 | - "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest", |
| 3769 | - "raring-desktop-i386.iso", "raring-desktop-i386.manifest", |
| 3770 | + "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest", |
| 3771 | + "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest", |
| 3772 | ): |
| 3773 | touch(os.path.join(publisher.publish_base, date, name)) |
| 3774 | publish_current = os.path.join(publisher.publish_base, "current") |
| 3775 | osextras.ensuredir(publish_current) |
| 3776 | for date, arch in (("20130320", "i386"), ("20130321", "amd64")): |
| 3777 | for name in ( |
| 3778 | - "raring-desktop-%s.iso" % arch, |
| 3779 | - "raring-desktop-%s.manifest" % arch, |
| 3780 | + "trusty-desktop-%s.iso" % arch, |
| 3781 | + "trusty-desktop-%s.manifest" % arch, |
| 3782 | ): |
| 3783 | os.symlink( |
| 3784 | os.path.join(os.pardir, date, name), |
| 3785 | @@ -1179,25 +1142,25 @@ |
| 3786 | |
| 3787 | @mock.patch("cdimage.tree.DailyTreePublisher.polish_directory") |
| 3788 | def test_mark_current_mixed_to_mixed(self, mock_polish_directory): |
| 3789 | - self.config["DIST"] = "raring" |
| 3790 | + self.config["DIST"] = "trusty" |
| 3791 | publisher = self.make_publisher("ubuntu", "daily-live") |
| 3792 | for date in "20130320", "20130321": |
| 3793 | for name in ( |
| 3794 | "MD5SUMS", |
| 3795 | - "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest", |
| 3796 | - "raring-desktop-amd64+mac.iso", |
| 3797 | - "raring-desktop-amd64+mac.manifest", |
| 3798 | - "raring-desktop-i386.iso", "raring-desktop-i386.manifest", |
| 3799 | - "raring-desktop-powerpc.iso", |
| 3800 | - "raring-desktop-powerpc.manifest", |
| 3801 | + "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest", |
| 3802 | + "trusty-desktop-amd64+mac.iso", |
| 3803 | + "trusty-desktop-amd64+mac.manifest", |
| 3804 | + "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest", |
| 3805 | + "trusty-desktop-powerpc.iso", |
| 3806 | + "trusty-desktop-powerpc.manifest", |
| 3807 | ): |
| 3808 | touch(os.path.join(publisher.publish_base, date, name)) |
| 3809 | publish_current = os.path.join(publisher.publish_base, "current") |
| 3810 | osextras.ensuredir(publish_current) |
| 3811 | for date, arch in (("20130320", "i386"), ("20130321", "amd64")): |
| 3812 | for name in ( |
| 3813 | - "raring-desktop-%s.iso" % arch, |
| 3814 | - "raring-desktop-%s.manifest" % arch, |
| 3815 | + "trusty-desktop-%s.iso" % arch, |
| 3816 | + "trusty-desktop-%s.manifest" % arch, |
| 3817 | ): |
| 3818 | os.symlink( |
| 3819 | os.path.join(os.pardir, date, name), |
| 3820 | @@ -1206,12 +1169,12 @@ |
| 3821 | self.assertFalse(os.path.islink(publish_current)) |
| 3822 | self.assertTrue(os.path.isdir(publish_current)) |
| 3823 | self.assertCountEqual([ |
| 3824 | - "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest", |
| 3825 | - "raring-desktop-i386.iso", "raring-desktop-i386.manifest", |
| 3826 | + "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest", |
| 3827 | + "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest", |
| 3828 | ], os.listdir(publish_current)) |
| 3829 | for name in ( |
| 3830 | - "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest", |
| 3831 | - "raring-desktop-i386.iso", "raring-desktop-i386.manifest", |
| 3832 | + "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest", |
| 3833 | + "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest", |
| 3834 | ): |
| 3835 | path = os.path.join(publish_current, name) |
| 3836 | self.assertTrue(os.path.islink(path)) |
| 3837 | @@ -1227,19 +1190,19 @@ |
| 3838 | self.assertFalse(os.path.islink(publish_current)) |
| 3839 | self.assertTrue(os.path.isdir(publish_current)) |
| 3840 | self.assertCountEqual([ |
| 3841 | - "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest", |
| 3842 | - "raring-desktop-amd64+mac.iso", |
| 3843 | - "raring-desktop-amd64+mac.manifest", |
| 3844 | - "raring-desktop-i386.iso", "raring-desktop-i386.manifest", |
| 3845 | - "raring-desktop-powerpc.iso", "raring-desktop-powerpc.manifest", |
| 3846 | + "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest", |
| 3847 | + "trusty-desktop-amd64+mac.iso", |
| 3848 | + "trusty-desktop-amd64+mac.manifest", |
| 3849 | + "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest", |
| 3850 | + "trusty-desktop-powerpc.iso", "trusty-desktop-powerpc.manifest", |
| 3851 | ], os.listdir(publish_current)) |
| 3852 | for date, arch in ( |
| 3853 | ("20130320", "amd64+mac"), ("20130320", "powerpc"), |
| 3854 | ("20130321", "amd64"), ("20130321", "i386"), |
| 3855 | ): |
| 3856 | for name in ( |
| 3857 | - "raring-desktop-%s.iso" % arch, |
| 3858 | - "raring-desktop-%s.manifest" % arch, |
| 3859 | + "trusty-desktop-%s.iso" % arch, |
| 3860 | + "trusty-desktop-%s.manifest" % arch, |
| 3861 | ): |
| 3862 | path = os.path.join(publish_current, name) |
| 3863 | self.assertTrue(os.path.islink(path)) |
| 3864 | @@ -1257,8 +1220,8 @@ |
| 3865 | publisher = self.make_publisher("ubuntu", "daily-live") |
| 3866 | old_target_dir = os.path.join(publisher.publish_base, "20130321") |
| 3867 | for name in ( |
| 3868 | - "raring-desktop-amd64.iso", "raring-desktop-amd64.manifest", |
| 3869 | - "raring-desktop-i386.iso", "raring-desktop-i386.manifest", |
| 3870 | + "trusty-desktop-amd64.iso", "trusty-desktop-amd64.manifest", |
| 3871 | + "trusty-desktop-i386.iso", "trusty-desktop-i386.manifest", |
| 3872 | ): |
| 3873 | touch(os.path.join(old_target_dir, name)) |
| 3874 | target_dir = os.path.join(publisher.publish_base, "20130921") |
| 3875 | @@ -1292,8 +1255,6 @@ |
| 3876 | ("ubuntu", "daily-live", "desktop", "Ubuntu Desktop"), |
| 3877 | ("kubuntu", "daily-live", "desktop", "Kubuntu Desktop"), |
| 3878 | ("kubuntu-active", "daily-live", "desktop", "Kubuntu Active"), |
| 3879 | - ("kubuntu-plasma5", "daily-live", "desktop", |
| 3880 | - "Kubuntu Plasma 5 Desktop"), |
| 3881 | ("edubuntu", "dvd", "dvd", "Edubuntu DVD"), |
| 3882 | ("xubuntu", "daily-live", "desktop", "Xubuntu Desktop"), |
| 3883 | ("ubuntu-server", "daily", "server", "Ubuntu Server"), |
| 3884 | @@ -1308,8 +1269,6 @@ |
| 3885 | ("ubuntu-budgie", "daily-live", "desktop", |
| 3886 | "Ubuntu Budgie Desktop"), |
| 3887 | ("ubuntu-mate", "daily-live", "desktop", "Ubuntu MATE Desktop"), |
| 3888 | - ("ubuntu-desktop-next", "daily-preinstalled", |
| 3889 | - "preinstalled-desktop-next", "Ubuntu Desktop (Unity 8)"), |
| 3890 | ): |
| 3891 | # Use "daily" here to match bin/post-qa; qa_product shouldn't |
| 3892 | # use the publisher's image_type at all. |
| 3893 | @@ -1335,15 +1294,6 @@ |
| 3894 | "ubuntu-touch", "daily-preinstalled", "preinstalled-touch", |
| 3895 | "armhf")) |
| 3896 | |
| 3897 | - def test_qa_product_ubuntu_touch_custom(self): |
| 3898 | - publisher = self.make_publisher( |
| 3899 | - "ubuntu-touch-custom", "daily-preinstalled") |
| 3900 | - self.assertEqual( |
| 3901 | - ("Ubuntu Touch Custom armhf", "iso"), |
| 3902 | - publisher.qa_product( |
| 3903 | - "ubuntu-touch-custom", "daily-preinstalled", |
| 3904 | - "preinstalled-touch", "armhf")) |
| 3905 | - |
| 3906 | def test_qa_product_ubuntu_preinstalled(self): |
| 3907 | publisher = self.make_publisher("ubuntu", "daily") |
| 3908 | self.assertEqual( |
| 3909 | @@ -1365,8 +1315,6 @@ |
| 3910 | ("ubuntu", "daily-live", "desktop", "Ubuntu Desktop"), |
| 3911 | ("kubuntu", "daily-live", "desktop", "Kubuntu Desktop"), |
| 3912 | ("kubuntu-active", "daily-live", "desktop", "Kubuntu Active"), |
| 3913 | - ("kubuntu-plasma5", "daily-live", "desktop", |
| 3914 | - "Kubuntu Plasma 5 Desktop"), |
| 3915 | ("edubuntu", "dvd", "dvd", "Edubuntu DVD"), |
| 3916 | ("xubuntu", "daily-live", "desktop", "Xubuntu Desktop"), |
| 3917 | ("ubuntu-server", "daily", "server", "Ubuntu Server"), |
| 3918 | @@ -1381,8 +1329,6 @@ |
| 3919 | ("ubuntu-budgie", "daily-live", "desktop", |
| 3920 | "Ubuntu Budgie Desktop"), |
| 3921 | ("ubuntu-mate", "daily-live", "desktop", "Ubuntu MATE Desktop"), |
| 3922 | - ("ubuntu-desktop-next/system-image", "daily-preinstalled", |
| 3923 | - "preinstalled-desktop-next", "Ubuntu Desktop (Unity 8)"), |
| 3924 | ): |
| 3925 | # Use "daily" here to match bin/post-qa; qa_product shouldn't |
| 3926 | # use the publisher's image_type at all. |
| 3927 | @@ -1405,14 +1351,14 @@ |
| 3928 | os.makedirs(os.path.join(publisher.publish_base, "20130221")) |
| 3929 | publisher.post_qa( |
| 3930 | "20130221", [ |
| 3931 | - "ubuntu/daily-live/raring-desktop-i386", |
| 3932 | - "ubuntu/daily-live/raring-desktop-amd64", |
| 3933 | + "ubuntu/daily-live/trusty-desktop-i386", |
| 3934 | + "ubuntu/daily-live/trusty-desktop-amd64", |
| 3935 | ]) |
| 3936 | expected = [ |
| 3937 | ["Ubuntu Desktop i386", "20130221", ""], |
| 3938 | ["Ubuntu Desktop amd64", "20130221", ""], |
| 3939 | ] |
| 3940 | - self.assertEqual("iso-raring", isotracker_module.tracker.target) |
| 3941 | + self.assertEqual("iso-trusty", isotracker_module.tracker.target) |
| 3942 | self.assertEqual(expected, isotracker_module.tracker.posted) |
| 3943 | |
| 3944 | os.makedirs(os.path.join( |
| 3945 | @@ -1434,14 +1380,14 @@ |
| 3946 | publisher = self.make_publisher("ubuntu", "daily-live") |
| 3947 | touch(os.path.join( |
| 3948 | self.temp_dir, "www", "full", "daily-live", "20130315", |
| 3949 | - "raring-desktop-i386.OVERSIZED")) |
| 3950 | + "trusty-desktop-i386.OVERSIZED")) |
| 3951 | publisher.post_qa( |
| 3952 | - "20130315", ["ubuntu/daily-live/raring-desktop-i386"]) |
| 3953 | + "20130315", ["ubuntu/daily-live/trusty-desktop-i386"]) |
| 3954 | expected_note = ( |
| 3955 | "<strong>WARNING: This image is OVERSIZED. This should never " |
| 3956 | "happen during milestone testing.</strong>") |
| 3957 | expected = [["Ubuntu Desktop i386", "20130315", expected_note]] |
| 3958 | - self.assertEqual("iso-raring", isotracker_module.tracker.target) |
| 3959 | + self.assertEqual("iso-trusty", isotracker_module.tracker.target) |
| 3960 | self.assertEqual(expected, isotracker_module.tracker.posted) |
| 3961 | |
| 3962 | publisher = self.make_publisher("kubuntu", "daily-live") |
| 3963 | @@ -1463,7 +1409,7 @@ |
| 3964 | self.assertRaisesRegex( |
| 3965 | Exception, r"Cannot post images from nonexistent directory: .*", |
| 3966 | publisher.post_qa, "bad-date", |
| 3967 | - ["ubuntu/daily-live/raring-desktop-i386"]) |
| 3968 | + ["ubuntu/daily-live/trusty-desktop-i386"]) |
| 3969 | |
| 3970 | @mock.patch("subprocess.call", return_value=0) |
| 3971 | @mock.patch("cdimage.tree.DailyTreePublisher.make_web_indices") |
| 3972 | @@ -1633,8 +1579,8 @@ |
| 3973 | publish_current = os.path.join(publisher.publish_base, "current") |
| 3974 | os.makedirs(publish_current) |
| 3975 | os.symlink( |
| 3976 | - os.path.join(os.pardir, "20130319", "raring-desktop-i386.iso"), |
| 3977 | - os.path.join(publish_current, "raring-desktop-i386.iso")) |
| 3978 | + os.path.join(os.pardir, "20130319", "trusty-desktop-i386.iso"), |
| 3979 | + os.path.join(publish_current, "trusty-desktop-i386.iso")) |
| 3980 | with mkfile(os.path.join( |
| 3981 | self.temp_dir, "etc", "purge-days")) as purge_days: |
| 3982 | print("daily 1", file=purge_days) |
| 3983 | @@ -1716,16 +1662,10 @@ |
| 3984 | return publisher |
| 3985 | |
| 3986 | def test_image_output(self): |
| 3987 | - self.config["DIST"] = "natty" |
| 3988 | - self.assertEqual( |
| 3989 | - os.path.join( |
| 3990 | - self.config.root, "scratch", "ubuntu-chinese-edition", |
| 3991 | - "natty"), |
| 3992 | - self.make_publisher("ubuntu", "daily-live").image_output("i386")) |
| 3993 | - self.config["DIST"] = "oneiric" |
| 3994 | - self.assertEqual( |
| 3995 | - os.path.join( |
| 3996 | - self.config.root, "scratch", "ubuntu-zh_CN", "oneiric", |
| 3997 | + self.config["DIST"] = "precise" |
| 3998 | + self.assertEqual( |
| 3999 | + os.path.join( |
| 4000 | + self.config.root, "scratch", "ubuntu-zh_CN", "precise", |
| 4001 | "daily-live", "live"), |
| 4002 | self.make_publisher("ubuntu", "daily-live").image_output("i386")) |
| 4003 | |
| 4004 | @@ -1817,15 +1757,15 @@ |
| 4005 | def test_post_qa_oversized(self): |
| 4006 | publisher = self.make_publisher("ubuntu", "daily-live") |
| 4007 | touch(os.path.join( |
| 4008 | - self.temp_dir, "www", "china-images", "raring", "daily-live", |
| 4009 | - "20130315", "raring-desktop-i386.OVERSIZED")) |
| 4010 | + self.temp_dir, "www", "china-images", "trusty", "daily-live", |
| 4011 | + "20130315", "trusty-desktop-i386.OVERSIZED")) |
| 4012 | publisher.post_qa( |
| 4013 | - "20130315", ["ubuntu-zh_CN/raring/daily-live/raring-desktop-i386"]) |
| 4014 | + "20130315", ["ubuntu-zh_CN/trusty/daily-live/trusty-desktop-i386"]) |
| 4015 | expected_note = ( |
| 4016 | "<strong>WARNING: This image is OVERSIZED. This should never " |
| 4017 | "happen during milestone testing.</strong>") |
| 4018 | expected = [["Ubuntu Chinese Desktop i386", "20130315", expected_note]] |
| 4019 | - self.assertEqual("localized-iso-china-raring", |
| 4020 | + self.assertEqual("localized-iso-china-trusty", |
| 4021 | isotracker_module.tracker.target) |
| 4022 | self.assertEqual(expected, isotracker_module.tracker.posted) |
| 4023 | |
| 4024 | @@ -2034,18 +1974,18 @@ |
| 4025 | |
| 4026 | def test_daily_base(self): |
| 4027 | self.config["PROJECT"] = "ubuntu" |
| 4028 | - self.config["DIST"] = "quantal" |
| 4029 | + self.config["DIST"] = "trusty" |
| 4030 | self.assertEqual( |
| 4031 | os.path.join( |
| 4032 | - self.temp_dir, "www", "full", "quantal", "daily", "20130327", |
| 4033 | + self.temp_dir, "www", "full", "trusty", "daily", "20130327", |
| 4034 | "i386"), |
| 4035 | self.get_publisher().daily_base( |
| 4036 | - "quantal/daily", "20130327", "wubi", "i386")) |
| 4037 | - self.config["DIST"] = "raring" |
| 4038 | + "trusty/daily", "20130327", "wubi", "i386")) |
| 4039 | + self.config["DIST"] = "trusty" |
| 4040 | self.assertEqual( |
| 4041 | os.path.join( |
| 4042 | self.temp_dir, "www", "full", "daily-live", "20130327", |
| 4043 | - "raring-desktop-i386"), |
| 4044 | + "trusty-desktop-i386"), |
| 4045 | self.get_publisher().daily_base( |
| 4046 | "daily-live", "20130327", "desktop", "i386")) |
| 4047 | |
| 4048 | @@ -2102,7 +2042,7 @@ |
| 4049 | def test_symlink(self): |
| 4050 | pool_path = os.path.join(self.temp_dir, ".pool", "foo.iso") |
| 4051 | touch(pool_path) |
| 4052 | - dist_path = os.path.join(self.temp_dir, "raring", "foo.iso") |
| 4053 | + dist_path = os.path.join(self.temp_dir, "trusty", "foo.iso") |
| 4054 | os.makedirs(os.path.dirname(dist_path)) |
| 4055 | self.get_publisher().symlink(pool_path, dist_path) |
| 4056 | self.assertEqual( |
| 4057 | @@ -2112,7 +2052,7 @@ |
| 4058 | def test_hardlink(self): |
| 4059 | pool_path = os.path.join(self.temp_dir, ".pool", "foo.iso") |
| 4060 | touch(pool_path) |
| 4061 | - dist_path = os.path.join(self.temp_dir, "raring", "foo.iso") |
| 4062 | + dist_path = os.path.join(self.temp_dir, "trusty", "foo.iso") |
| 4063 | os.makedirs(os.path.dirname(dist_path)) |
| 4064 | self.get_publisher().hardlink(pool_path, dist_path) |
| 4065 | self.assertEqual(os.stat(pool_path), os.stat(dist_path)) |
| 4066 | @@ -2206,15 +2146,15 @@ |
| 4067 | |
| 4068 | def test_target_dir(self): |
| 4069 | self.config["PROJECT"] = "ubuntu" |
| 4070 | - self.config["DIST"] = "raring" |
| 4071 | + self.config["DIST"] = "trusty" |
| 4072 | self.assertEqual( |
| 4073 | os.path.join( |
| 4074 | - self.temp_dir, "www", "full", "releases", "raring", "release"), |
| 4075 | + self.temp_dir, "www", "full", "releases", "trusty", "release"), |
| 4076 | self.get_publisher().target_dir("daily", "20130327", "alternate")) |
| 4077 | self.config["PROJECT"] = "kubuntu" |
| 4078 | self.assertEqual( |
| 4079 | os.path.join( |
| 4080 | - self.temp_dir, "www", "full", "kubuntu", "releases", "raring", |
| 4081 | + self.temp_dir, "www", "full", "kubuntu", "releases", "trusty", |
| 4082 | "release", "source"), |
| 4083 | self.get_publisher().target_dir("daily", "20130327", "src")) |
| 4084 | |
| 4085 | @@ -2232,17 +2172,17 @@ |
| 4086 | |
| 4087 | def test_torrent_dir(self): |
| 4088 | self.config["PROJECT"] = "ubuntu" |
| 4089 | - self.config["DIST"] = "raring" |
| 4090 | + self.config["DIST"] = "trusty" |
| 4091 | self.assertEqual( |
| 4092 | os.path.join( |
| 4093 | self.temp_dir, "www", "torrent", "releases", |
| 4094 | - "raring", "release", "desktop"), |
| 4095 | + "trusty", "release", "desktop"), |
| 4096 | self.get_publisher().torrent_dir("daily-live", "desktop")) |
| 4097 | self.config["PROJECT"] = "kubuntu" |
| 4098 | self.assertEqual( |
| 4099 | os.path.join( |
| 4100 | self.temp_dir, "www", "torrent", "kubuntu", "releases", |
| 4101 | - "raring", "beta-2", "desktop"), |
| 4102 | + "trusty", "beta-2", "desktop"), |
| 4103 | self.get_publisher(status="beta-2").torrent_dir( |
| 4104 | "daily-live", "desktop")) |
| 4105 | |
| 4106 | @@ -2278,9 +2218,9 @@ |
| 4107 | |
| 4108 | def test_publish_release_prefixes(self): |
| 4109 | self.config["PROJECT"] = "ubuntu" |
| 4110 | - self.config["DIST"] = "raring" |
| 4111 | + self.config["DIST"] = "trusty" |
| 4112 | self.assertEqual( |
| 4113 | - ("raring", "raring-beta2"), |
| 4114 | + ("trusty", "trusty-beta2"), |
| 4115 | self.get_publisher( |
| 4116 | official="no", status="beta-2").publish_release_prefixes()) |
| 4117 | self.config["PROJECT"] = "kubuntu" |
| 4118 | @@ -2356,16 +2296,16 @@ |
| 4119 | def test_publish_release_arch_ubuntu_desktop_no(self, mock_call, *args): |
| 4120 | self.config["PROJECT"] = "ubuntu" |
| 4121 | self.config["CAPPROJECT"] = "Ubuntu" |
| 4122 | - self.config["DIST"] = "raring" |
| 4123 | + self.config["DIST"] = "trusty" |
| 4124 | daily_dir = os.path.join( |
| 4125 | self.temp_dir, "www", "full", "daily-live", "20130327") |
| 4126 | - touch(os.path.join(daily_dir, "raring-desktop-i386.iso")) |
| 4127 | - touch(os.path.join(daily_dir, "raring-desktop-i386.manifest")) |
| 4128 | - touch(os.path.join(daily_dir, "raring-desktop-i386.iso.zsync")) |
| 4129 | + touch(os.path.join(daily_dir, "trusty-desktop-i386.iso")) |
| 4130 | + touch(os.path.join(daily_dir, "trusty-desktop-i386.manifest")) |
| 4131 | + touch(os.path.join(daily_dir, "trusty-desktop-i386.iso.zsync")) |
| 4132 | target_dir = os.path.join( |
| 4133 | - self.temp_dir, "www", "full", "releases", "raring", "rc") |
| 4134 | + self.temp_dir, "www", "full", "releases", "trusty", "rc") |
| 4135 | torrent_dir = os.path.join( |
| 4136 | - self.temp_dir, "www", "torrent", "releases", "raring", "rc", |
| 4137 | + self.temp_dir, "www", "torrent", "releases", "trusty", "rc", |
| 4138 | "desktop") |
| 4139 | osextras.ensuredir(target_dir) |
| 4140 | osextras.ensuredir(torrent_dir) |
| 4141 | @@ -2375,13 +2315,13 @@ |
| 4142 | "daily-live", "20130327", "desktop", "i386") |
| 4143 | self.assertLogEqual([ |
| 4144 | "Copying desktop-i386 image ...", |
| 4145 | - "Creating torrent for %s/raring-desktop-i386.iso ..." % target_dir, |
| 4146 | + "Creating torrent for %s/trusty-desktop-i386.iso ..." % target_dir, |
| 4147 | ]) |
| 4148 | self.assertCountEqual([ |
| 4149 | - "raring-desktop-i386.iso", "raring-desktop-i386.iso.torrent", |
| 4150 | - "raring-desktop-i386.iso.zsync", "raring-desktop-i386.manifest", |
| 4151 | + "trusty-desktop-i386.iso", "trusty-desktop-i386.iso.torrent", |
| 4152 | + "trusty-desktop-i386.iso.zsync", "trusty-desktop-i386.manifest", |
| 4153 | ], os.listdir(target_dir)) |
| 4154 | - target_base = os.path.join(target_dir, "raring-desktop-i386") |
| 4155 | + target_base = os.path.join(target_dir, "trusty-desktop-i386") |
| 4156 | self.assertFalse(os.path.islink("%s.iso" % target_base)) |
| 4157 | self.assertFalse(os.path.islink("%s.manifest" % target_base)) |
| 4158 | mock_call.assert_called_once_with([ |
| 4159 | @@ -2390,9 +2330,9 @@ |
| 4160 | "%s.iso" % target_base, |
| 4161 | ], stdout=mock.ANY) |
| 4162 | self.assertCountEqual([ |
| 4163 | - "raring-desktop-i386.iso", "raring-desktop-i386.iso.torrent", |
| 4164 | + "trusty-desktop-i386.iso", "trusty-desktop-i386.iso.torrent", |
| 4165 | ], os.listdir(torrent_dir)) |
| 4166 | - torrent_base = os.path.join(torrent_dir, "raring-desktop-i386") |
| 4167 | + torrent_base = os.path.join(torrent_dir, "trusty-desktop-i386") |
| 4168 | self.assertEqual( |
| 4169 | os.stat("%s.iso" % target_base), os.stat("%s.iso" % torrent_base)) |
| 4170 | self.assertEqual( |
| 4171 | @@ -2492,14 +2432,14 @@ |
| 4172 | |
| 4173 | def test_target_dir(self): |
| 4174 | self.config["PROJECT"] = "ubuntu" |
| 4175 | - self.config["DIST"] = "raring" |
| 4176 | + self.config["DIST"] = "trusty" |
| 4177 | self.assertEqual( |
| 4178 | - os.path.join(self.temp_dir, "www", "simple", "raring"), |
| 4179 | + os.path.join(self.temp_dir, "www", "simple", "trusty"), |
| 4180 | self.get_publisher().target_dir("daily", "20130327", "alternate")) |
| 4181 | self.config["PROJECT"] = "kubuntu" |
| 4182 | self.assertEqual( |
| 4183 | os.path.join( |
| 4184 | - self.temp_dir, "www", "simple", "kubuntu", "raring", "source"), |
| 4185 | + self.temp_dir, "www", "simple", "kubuntu", "trusty", "source"), |
| 4186 | self.get_publisher().target_dir("daily", "20130327", "src")) |
| 4187 | |
| 4188 | def test_version_link(self): |
| 4189 | @@ -2515,29 +2455,29 @@ |
| 4190 | |
| 4191 | def test_pool_dir(self): |
| 4192 | self.config["PROJECT"] = "ubuntu" |
| 4193 | - self.config["DIST"] = "raring" |
| 4194 | + self.config["DIST"] = "trusty" |
| 4195 | self.assertEqual( |
| 4196 | os.path.join(self.temp_dir, "www", "simple", ".pool"), |
| 4197 | self.get_publisher().pool_dir("daily")) |
| 4198 | self.config["PROJECT"] = "kubuntu" |
| 4199 | - self.config["DIST"] = "raring" |
| 4200 | + self.config["DIST"] = "trusty" |
| 4201 | self.assertEqual( |
| 4202 | os.path.join(self.temp_dir, "www", "simple", "kubuntu", ".pool"), |
| 4203 | self.get_publisher().pool_dir("daily")) |
| 4204 | |
| 4205 | def test_torrent_dir(self): |
| 4206 | self.config["PROJECT"] = "ubuntu" |
| 4207 | - self.config["DIST"] = "raring" |
| 4208 | + self.config["DIST"] = "trusty" |
| 4209 | self.assertEqual( |
| 4210 | os.path.join( |
| 4211 | self.temp_dir, "www", "torrent", "simple", |
| 4212 | - "raring", "desktop"), |
| 4213 | + "trusty", "desktop"), |
| 4214 | self.get_publisher().torrent_dir("daily-live", "desktop")) |
| 4215 | self.config["PROJECT"] = "kubuntu" |
| 4216 | self.assertEqual( |
| 4217 | os.path.join( |
| 4218 | self.temp_dir, "www", "torrent", "kubuntu", "simple", |
| 4219 | - "raring", "desktop"), |
| 4220 | + "trusty", "desktop"), |
| 4221 | self.get_publisher().torrent_dir("daily-live", "desktop")) |
| 4222 | |
| 4223 | def test_want_torrent(self): |
| 4224 | @@ -2687,9 +2627,9 @@ |
| 4225 | "ubuntu-13.04-rc-desktop-i386.manifest", |
| 4226 | ], os.listdir(pool_dir)) |
| 4227 | self.assertFalse(os.path.exists(os.path.join( |
| 4228 | - self.temp_dir, "www", "simple", "raring"))) |
| 4229 | + self.temp_dir, "www", "simple", "trusty"))) |
| 4230 | self.assertFalse(os.path.exists(os.path.join( |
| 4231 | - self.temp_dir, "www", "torrent", "simple", "raring", "desktop"))) |
| 4232 | + self.temp_dir, "www", "torrent", "simple", "trusty", "desktop"))) |
| 4233 | pool_base = os.path.join(pool_dir, "ubuntu-13.04-rc-desktop-i386") |
| 4234 | mock_call.assert_called_once_with([ |
| 4235 | "zsyncmake", "-o", "%s.iso.zsync" % pool_base, |
| 4236 | |
| 4237 | === modified file 'lib/cdimage/tree.py' |
| 4238 | --- lib/cdimage/tree.py 2019-02-27 21:10:40 +0000 |
| 4239 | +++ lib/cdimage/tree.py 2019-02-28 22:59:07 +0000 |
| 4240 | @@ -63,21 +63,16 @@ |
| 4241 | projects = [ |
| 4242 | "edubuntu", |
| 4243 | "gobuntu", |
| 4244 | - "jeos", |
| 4245 | "kubuntu", |
| 4246 | "kubuntu-active", |
| 4247 | "kubuntu-netbook", |
| 4248 | - "kubuntu-plasma5", |
| 4249 | "lubuntu", |
| 4250 | "lubuntu-next", |
| 4251 | "mythbuntu", |
| 4252 | "ubuntu", |
| 4253 | - "ubuntu-desktop-next", |
| 4254 | "ubuntu-gnome", |
| 4255 | "ubuntu-budgie", |
| 4256 | "ubuntu-mate", |
| 4257 | - "ubuntu-headless", |
| 4258 | - "ubuntu-netbook", |
| 4259 | "ubuntu-server", |
| 4260 | "ubuntukylin", |
| 4261 | "ubuntustudio", |
| 4262 | @@ -376,65 +371,36 @@ |
| 4263 | @property |
| 4264 | def publish_type(self): |
| 4265 | if self.image_type.endswith("-preinstalled"): |
| 4266 | - if self.project == "ubuntu-netbook": |
| 4267 | - return "preinstalled-netbook" |
| 4268 | - elif self.project == "ubuntu-headless": |
| 4269 | - return "preinstalled-headless" |
| 4270 | - elif self.project == "ubuntu-server": |
| 4271 | + if self.project == "ubuntu-server": |
| 4272 | return "preinstalled-server" |
| 4273 | - elif self.project in ("ubuntu-touch", "ubuntu-touch-custom"): |
| 4274 | + elif self.project == "ubuntu-touch": |
| 4275 | return "preinstalled-touch" |
| 4276 | elif self.project == "ubuntu-core": |
| 4277 | return "preinstalled-core" |
| 4278 | - elif self.project == "ubuntu-desktop-next": |
| 4279 | - return "preinstalled-desktop-next" |
| 4280 | else: |
| 4281 | return "preinstalled-desktop" |
| 4282 | elif self.image_type.endswith("-live"): |
| 4283 | if self.project == "edubuntu": |
| 4284 | - if self.config["DIST"] <= "edgy": |
| 4285 | - return "live" |
| 4286 | - else: |
| 4287 | - return "desktop" |
| 4288 | - elif self.project == "ubuntu-mid": |
| 4289 | - return "mid" |
| 4290 | - elif self.project == "ubuntu-moblin-remix": |
| 4291 | - return "moblin-remix" |
| 4292 | - elif self.project in ("ubuntu-netbook", "kubuntu-netbook"): |
| 4293 | + return "desktop" |
| 4294 | + elif self.project == "kubuntu-netbook": |
| 4295 | return "netbook" |
| 4296 | elif self.project == "ubuntu-server": |
| 4297 | return "live-server" |
| 4298 | elif self.project == "ubuntu-core": |
| 4299 | return "live-core" |
| 4300 | else: |
| 4301 | - if self.config["DIST"] <= "breezy": |
| 4302 | - return "live" |
| 4303 | - else: |
| 4304 | - return "desktop" |
| 4305 | + return "desktop" |
| 4306 | elif self.image_type.endswith("_dvd") or self.image_type == "dvd": |
| 4307 | return "dvd" |
| 4308 | else: |
| 4309 | if self.project == "edubuntu": |
| 4310 | - if self.config["DIST"] <= "edgy": |
| 4311 | - return "install" |
| 4312 | - elif self.config["DIST"] <= "gutsy": |
| 4313 | - return "server" |
| 4314 | - else: |
| 4315 | - return "addon" |
| 4316 | + return "addon" |
| 4317 | elif self.project == "ubuntu-server": |
| 4318 | - if self.config["DIST"] <= "breezy": |
| 4319 | - return "install" |
| 4320 | - else: |
| 4321 | - return "server" |
| 4322 | - elif self.project == "jeos": |
| 4323 | - return "jeos" |
| 4324 | + return "server" |
| 4325 | elif self.project == "ubuntu-base": |
| 4326 | return "base" |
| 4327 | else: |
| 4328 | - if self.config["DIST"] <= "breezy": |
| 4329 | - return "install" |
| 4330 | - else: |
| 4331 | - return "alternate" |
| 4332 | + return "alternate" |
| 4333 | |
| 4334 | # Keep this in sync with publish_type above. |
| 4335 | @staticmethod |
| 4336 | @@ -442,13 +408,13 @@ |
| 4337 | if publish_type.startswith("preinstalled-"): |
| 4338 | return "daily-preinstalled" |
| 4339 | elif publish_type in ( |
| 4340 | - "desktop", "live", "mid", "moblin-remix", "netbook", |
| 4341 | + "desktop", "live", "netbook", |
| 4342 | "live-core", "live-server"): |
| 4343 | return "daily-live" |
| 4344 | elif publish_type == "dvd": |
| 4345 | return "dvd" |
| 4346 | elif publish_type in ( |
| 4347 | - "addon", "alternate", "base", "install", "jeos", "server"): |
| 4348 | + "addon", "alternate", "base", "install", "server"): |
| 4349 | return "daily" |
| 4350 | else: |
| 4351 | return None |
| 4352 | @@ -474,8 +440,6 @@ |
| 4353 | def cssincludes(self): |
| 4354 | if self.project == "kubuntu": |
| 4355 | return ["//releases.ubuntu.com/include/kubuntu.css"] |
| 4356 | - if self.project == "kubuntu-plasma5": |
| 4357 | - return ["//releases.ubuntu.com/include/kubuntu-plasma5.css"] |
| 4358 | if self.project in ("lubuntu", "lubuntu-next"): |
| 4359 | return ["//cdimage.ubuntu.com/include/lubuntu/style.css"] |
| 4360 | else: |
| 4361 | @@ -485,11 +449,10 @@ |
| 4362 | def cdtypestr(self, publish_type, image_format): |
| 4363 | if image_format in ("tar.gz", "tar.xz", "custom.tar.gz"): |
| 4364 | cd = "filesystem archive" |
| 4365 | - elif self.config["DIST"] < "quantal": |
| 4366 | + elif self.config["DIST"] < "trusty": |
| 4367 | if image_format in ("img", "img.gz"): |
| 4368 | cd = "image" |
| 4369 | elif self.project == "ubuntustudio": |
| 4370 | - # Ubuntu Studio is expected to be oversized in Gutsy; sigh. |
| 4371 | cd = "DVD" |
| 4372 | else: |
| 4373 | cd = "CD" |
| 4374 | @@ -523,18 +486,12 @@ |
| 4375 | return "source %s" % cd |
| 4376 | elif publish_type == "netbook": |
| 4377 | return "netbook live %s" % cd |
| 4378 | - elif publish_type == "mid": |
| 4379 | - return "MID USB image" |
| 4380 | - elif publish_type == "moblin-remix": |
| 4381 | - return "Moblin live CD" |
| 4382 | elif publish_type == "active": |
| 4383 | return "preview active image" |
| 4384 | elif publish_type in ("server-uec", "uec"): |
| 4385 | return "UEC image" |
| 4386 | elif publish_type == "preinstalled-desktop": |
| 4387 | return "preinstalled desktop %s" % cd |
| 4388 | - elif publish_type == "preinstalled-headless": |
| 4389 | - return "preinstalled headless %s" % cd |
| 4390 | elif publish_type == "preinstalled-server": |
| 4391 | return "preinstalled server %s" % cd |
| 4392 | elif publish_type == "preinstalled-netbook": |
| 4393 | @@ -545,8 +502,6 @@ |
| 4394 | return "preinstalled touch image" |
| 4395 | elif publish_type == "preinstalled-core": |
| 4396 | return "preinstalled core image" |
| 4397 | - elif publish_type == "preinstalled-desktop-next": |
| 4398 | - return "preinstalled desktop next image" |
| 4399 | elif publish_type == "wubi": |
| 4400 | return "Wubi %s" % cd |
| 4401 | else: |
| 4402 | @@ -556,35 +511,20 @@ |
| 4403 | capproject = self.config.capproject |
| 4404 | series = self.config["DIST"] |
| 4405 | |
| 4406 | - if self.project == "mid": |
| 4407 | - # MID has lower memory requirements than others |
| 4408 | - desktop_ram = 128 |
| 4409 | if self.project == "xubuntu": |
| 4410 | - if series <= "intrepid": |
| 4411 | - desktop_ram = 128 |
| 4412 | - else: |
| 4413 | - desktop_ram = 192 |
| 4414 | + desktop_ram = 192 |
| 4415 | else: |
| 4416 | - if series <= "feisty": |
| 4417 | - desktop_ram = 256 |
| 4418 | - elif series <= "gutsy": |
| 4419 | - desktop_ram = 320 |
| 4420 | - elif series <= "hardy": |
| 4421 | - desktop_ram = 384 |
| 4422 | - elif series <= "maverick": |
| 4423 | - desktop_ram = 256 |
| 4424 | - elif series <= "artful": |
| 4425 | + if series <= "xenial": |
| 4426 | desktop_ram = 384 |
| 4427 | else: |
| 4428 | desktop_ram = 1024 |
| 4429 | |
| 4430 | if image_format in ("tar.gz", "tar.xz", "custom.tar.gz"): |
| 4431 | cd = "filesystem archive" |
| 4432 | - elif self.config["DIST"] < "quantal": |
| 4433 | + elif self.config["DIST"] <= "precise": |
| 4434 | if image_format in ("img", "img.gz"): |
| 4435 | cd = "image" |
| 4436 | elif self.project == "ubuntustudio": |
| 4437 | - # Ubuntu Studio is expected to be oversized in Gutsy; sigh. |
| 4438 | cd = "dvd" |
| 4439 | else: |
| 4440 | cd = "cd" |
| 4441 | @@ -612,13 +552,6 @@ |
| 4442 | cd) |
| 4443 | self.prefmsg_emitted = True |
| 4444 | sentences.append(desktop_req) |
| 4445 | - if self.project == "ubuntu-desktop-next": |
| 4446 | - sentences.append( |
| 4447 | - "This is an experimental image. Please %s for caveats and " |
| 4448 | - "workarounds." % |
| 4449 | - Link("https://wiki.ubuntu.com/Unity8DesktopIso", |
| 4450 | - "read this page on the Ubuntu wiki", |
| 4451 | - show_class=True)) |
| 4452 | if self.project == "edubuntu": |
| 4453 | sentences.append( |
| 4454 | "You can install additional educational programs using " |
| 4455 | @@ -651,24 +584,6 @@ |
| 4456 | "installer, please file a bug on the %s package." % bug_link, |
| 4457 | ]) |
| 4458 | return |
| 4459 | - elif publish_type == "mid": |
| 4460 | - sentences.append( |
| 4461 | - "The MID USB image allows you to try %s without changing your " |
| 4462 | - "computer at all, and at your option to install it " |
| 4463 | - "permanently later." % capproject) |
| 4464 | - sentences.append( |
| 4465 | - "This USB image is optimized for handheld devices with 4-7\" " |
| 4466 | - "touchscreens and limited processing power.") |
| 4467 | - sentences.append(desktop_req) |
| 4468 | - elif publish_type == "moblin-remix": |
| 4469 | - sentences.append( |
| 4470 | - "The live %s allows you to try Ubuntu Moblin Remix without " |
| 4471 | - "changing your computer at all, and at your option to install " |
| 4472 | - "it permanently later." % cd) |
| 4473 | - sentences.append( |
| 4474 | - "This live %s is optimized for netbooks with screens up to " |
| 4475 | - "10\"." % cd) |
| 4476 | - sentences.append(desktop_req) |
| 4477 | elif publish_type == "server" or publish_type == "live-server": |
| 4478 | if self.project == "edubuntu": |
| 4479 | sentences.append( |
| 4480 | @@ -832,7 +747,6 @@ |
| 4481 | "hppa": "HP PA-RISC", |
| 4482 | "i386": "32-bit PC (i386)", |
| 4483 | "ia64": "IA-64", |
| 4484 | - "lpia": "Low-Power Intel Architecture", |
| 4485 | "powerpc": "Mac (PowerPC) and IBM-PPC (POWER5)", |
| 4486 | "powerpc+ps3": "PlayStation 3", |
| 4487 | "ppc64el": "PowerPC64 Little-Endian", |
| 4488 | @@ -911,10 +825,6 @@ |
| 4489 | "Intel processors.") |
| 4490 | elif arch == "ia64": |
| 4491 | sentences.append("For Intel Itanium and Itanium 2 computers.") |
| 4492 | - elif arch == "lpia": |
| 4493 | - sentences.append( |
| 4494 | - "For devices using the Low-Power Intel Architecture, " |
| 4495 | - "including the A1xx and Atom processors.") |
| 4496 | elif arch == "powerpc": |
| 4497 | sentences.append( |
| 4498 | "For Apple Macintosh G3, G4, and G5 computers, including " |
| 4499 | @@ -922,7 +832,7 @@ |
| 4500 | "machines.") |
| 4501 | elif arch == "powerpc+ps3": |
| 4502 | sentences.append("For Sony PlayStation 3 systems.") |
| 4503 | - if publish_type == "desktop" and self.config["DIST"] >= "gutsy": |
| 4504 | + if publish_type == "desktop": |
| 4505 | capproject = self.config.capproject |
| 4506 | sentences.append( |
| 4507 | "(This defaults to installing %s permanently, since there " |
| 4508 | @@ -952,8 +862,7 @@ |
| 4509 | return |
| 4510 | |
| 4511 | usb_projects = ( |
| 4512 | - "ubuntu-mid", "ubuntu-moblin-remix", |
| 4513 | - "kubuntu", "kubuntu-active", "kubuntu-plasma5", |
| 4514 | + "kubuntu", "kubuntu-active", |
| 4515 | "ubuntu-mate", |
| 4516 | ) |
| 4517 | series = self.config["DIST"] |
| 4518 | @@ -979,8 +888,8 @@ |
| 4519 | "However, you may still test it using a DVD, a larger USB " |
| 4520 | "drive, or a virtual machine.") |
| 4521 | elif (self.project in usb_projects or |
| 4522 | - (self.project == "xubuntu" and series >= "raring") or |
| 4523 | - (self.project == "ubuntu-gnome" and series >= "saucy")): |
| 4524 | + (self.project == "xubuntu" and series >= "trusty") or |
| 4525 | + (self.project == "ubuntu-gnome" and series >= "trusty")): |
| 4526 | sentences.append( |
| 4527 | "Warning: This image is oversized (which is a bug) and will " |
| 4528 | "not fit onto a 1GB USB stick.") |
| 4529 | @@ -1156,13 +1065,13 @@ |
| 4530 | "serveraddon", "addon", |
| 4531 | "dvd", |
| 4532 | "src", |
| 4533 | - "netbook", "mid", "moblin-remix", "mobile", "active", |
| 4534 | + "netbook", "mobile", "active", |
| 4535 | "uec", "server-uec", |
| 4536 | "preinstalled-desktop", "preinstalled-netbook", |
| 4537 | "preinstalled-mobile", "preinstalled-active", |
| 4538 | - "preinstalled-headless", "preinstalled-server", |
| 4539 | + "preinstalled-server", |
| 4540 | "preinstalled-touch", "preinstalled-core", "wubi", |
| 4541 | - "preinstalled-desktop-next", "live-core", |
| 4542 | + "live-core", |
| 4543 | ) |
| 4544 | |
| 4545 | all_arches = ( |
| 4546 | @@ -1178,7 +1087,6 @@ |
| 4547 | "ppc64el", |
| 4548 | "hppa", |
| 4549 | "ia64", |
| 4550 | - "lpia", |
| 4551 | "s390x", |
| 4552 | "sparc", |
| 4553 | ) |
| 4554 | @@ -1254,12 +1162,6 @@ |
| 4555 | "<link " |
| 4556 | "href='http://fonts.googleapis.com/css?family=Ubuntu' " |
| 4557 | "rel='stylesheet' type='text/css'>", file=header) |
| 4558 | - if self.project == "kubuntu-plasma5": |
| 4559 | - print( |
| 4560 | - "<link " |
| 4561 | - "href='http://fonts.googleapis.com/css?family=Oxygen' " |
| 4562 | - "rel='stylesheet' type='text/css'>", file=header) |
| 4563 | - if self.project in ("kubuntu", "kubuntu-plasma5"): |
| 4564 | print( |
| 4565 | "<link rel=\"icon\" type=\"image/png\" " |
| 4566 | "href=\"http://www.kubuntu.org/themes/kubuntu10.04/" |
| 4567 | @@ -1315,11 +1217,8 @@ |
| 4568 | if ("full" in reldir.split(os.pardir) and |
| 4569 | "-alpha-" not in base_prefix and |
| 4570 | base_prefix != self.config.series): |
| 4571 | - if self.project in ( |
| 4572 | - "ubuntu", "ubuntu-server", "ubuntu-netbook"): |
| 4573 | + if self.project in ("ubuntu", "ubuntu-server"): |
| 4574 | url = "http://releases.ubuntu.com/" |
| 4575 | - elif self.project == "kubuntu" and series <= "oneiric": |
| 4576 | - url = "http://releases.ubuntu.com/kubuntu/" |
| 4577 | else: |
| 4578 | url = None |
| 4579 | if url: |
| 4580 | @@ -1427,17 +1326,9 @@ |
| 4581 | |
| 4582 | for path, arch, base in paths: |
| 4583 | if arch is None: |
| 4584 | - if publish_type == "mid": |
| 4585 | - imgarch = "lpia" |
| 4586 | - else: |
| 4587 | - raise WebIndicesException( |
| 4588 | - "Unknown image type %s!" % |
| 4589 | - publish_type) |
| 4590 | - archstr = self.arch_strings[imgarch] |
| 4591 | - imagestr = "%s %s" % (archstr, cdtypestr) |
| 4592 | - htaccessimagestr = "%s for %s computers" % ( |
| 4593 | - self.titlecase(cdtypestr), archstr) |
| 4594 | - archdesc = self.archdesc(imgarch, publish_type) |
| 4595 | + raise WebIndicesException( |
| 4596 | + "Unknown image type %s!" % |
| 4597 | + publish_type) |
| 4598 | elif publish_type == "src": |
| 4599 | imagestr = "%s %s" % ( |
| 4600 | self.titlecase(cdtypestr), arch) |
| 4601 | @@ -1638,7 +1529,7 @@ |
| 4602 | if got_iso or got_img: |
| 4603 | print(file=header) |
| 4604 | |
| 4605 | - if self.config.project in ("ubuntu-touch", "ubuntu-touch-custom"): |
| 4606 | + if self.config.project == "ubuntu-touch": |
| 4607 | for tag in self.ubuntu_touch_legal_notice(): |
| 4608 | print(tag, file=header) |
| 4609 | print(file=header) |
| 4610 | @@ -1845,15 +1736,7 @@ |
| 4611 | # All Edubuntu images are DVD sized (including arm). |
| 4612 | # Ubuntu Studio is always DVD-sized for now. |
| 4613 | return 4700372992 |
| 4614 | - elif self.project in ( |
| 4615 | - "ubuntu-mid", "ubuntu-moblin-remix", |
| 4616 | - ): |
| 4617 | - # Mobile images are designed for USB drives; arbitrarily pick |
| 4618 | - # 1GB as a limit. |
| 4619 | - return 1024 * 1024 * 1024 |
| 4620 | - elif self.project in ( |
| 4621 | - "kubuntu", "kubuntu-active", "kubuntu-plasma5", |
| 4622 | - ): |
| 4623 | + elif self.project in ("kubuntu", "kubuntu-active"): |
| 4624 | if self.config["DIST"] >= "xenial": |
| 4625 | # Per https://lists.ubuntu.com/archives/ |
| 4626 | # ... ubuntu-release/2016-May/003749.html |
| 4627 | @@ -1862,23 +1745,14 @@ |
| 4628 | return (1024 * 1024 * 1024) + (1024 * 1024 * 200) |
| 4629 | elif (self.project in ("ubuntu", "ubuntukylin") and |
| 4630 | self.publish_type != "dvd" and |
| 4631 | - self.config["DIST"] >= "quantal"): |
| 4632 | - # Ubuntu quantal onward has a succession of arbitrary limits. |
| 4633 | - if self.config["DIST"] == "quantal": |
| 4634 | - return 801000000 |
| 4635 | - elif self.config["DIST"] == "raring": |
| 4636 | - if arch == "powerpc": |
| 4637 | - return 850000000 |
| 4638 | - else: |
| 4639 | - return 835000000 |
| 4640 | - elif self.config["DIST"] == "saucy": |
| 4641 | - return 950000000 |
| 4642 | - elif self.config["DIST"] in ("trusty", "utopic", "vivid", "wily"): |
| 4643 | + self.config["DIST"] >= "trusty"): |
| 4644 | + if self.config["DIST"] == "trusty": |
| 4645 | return 1.2 * 1000 * 1000 * 1000 |
| 4646 | else: |
| 4647 | # next relevant size limit is a 2GB (not 2GiB) USB stick |
| 4648 | return 2 * 1000 * 1000 * 1000 |
| 4649 | - elif self.project == "ubuntu-gnome" and self.config["DIST"] >= "saucy": |
| 4650 | + elif (self.project == "ubuntu-gnome" and |
| 4651 | + self.config["DIST"] >= "trusty"): |
| 4652 | # Per https://lists.ubuntu.com/archives/ |
| 4653 | # ... ubuntu-release/2016-May/003740.html |
| 4654 | if self.config["DIST"] >= "xenial": |
| 4655 | @@ -1895,7 +1769,7 @@ |
| 4656 | elif self.project == "xubuntu" and self.config["DIST"] >= "xenial": |
| 4657 | # https://irclogs.ubuntu.com/2019/02/17/%23ubuntu-release.html#t03:04 |
| 4658 | return 2 * 1000 * 1000 * 1000 |
| 4659 | - elif self.project == "xubuntu" and self.config["DIST"] >= "raring": |
| 4660 | + elif self.project == "xubuntu" and self.config["DIST"] >= "trusty": |
| 4661 | # http://irclogs.ubuntu.com/2013/02/11/%23xubuntu-devel.html#t21:48 |
| 4662 | return 1024 * 1024 * 1024 |
| 4663 | elif self.project == "ubuntu-mate": |
| 4664 | @@ -1907,7 +1781,7 @@ |
| 4665 | # https://bugs.launchpad.net/bugs/1796368 |
| 4666 | return 2 * 1000 * 1000 * 1000 |
| 4667 | elif (self.project in ("lubuntu", "lubuntu-next") and |
| 4668 | - self.config["DIST"] >= "artful"): |
| 4669 | + self.config["DIST"] >= "bionic"): |
| 4670 | # https://irclogs.ubuntu.com/2017/07/27/%23ubuntu-release.html#t23:05 |
| 4671 | return int(1.5 * 1000 * 1000 * 1000) |
| 4672 | elif self.project == "lubuntu" and self.config["DIST"] >= "trusty": |
| 4673 | @@ -1915,11 +1789,7 @@ |
| 4674 | # https://irclogs.ubuntu.com/2016/10/01/%23ubuntu-release.html#t19:06 |
| 4675 | return 1024 * 1024 * 1024 |
| 4676 | elif self.project == "ubuntu-server": |
| 4677 | - if self.config["DIST"] == "xenial": |
| 4678 | - return 1024 * 1024 * 1024 |
| 4679 | - elif self.config["DIST"] >= "zesty" and arch == "ppc64el": |
| 4680 | - return 1024 * 1024 * 1024 |
| 4681 | - elif self.config["DIST"] >= "bionic": |
| 4682 | + if self.config["DIST"] >= "xenial": |
| 4683 | return 1024 * 1024 * 1024 |
| 4684 | else: |
| 4685 | return 736665600 |
| 4686 | @@ -2002,20 +1872,17 @@ |
| 4687 | return "iso" |
| 4688 | |
| 4689 | def jigdo_ports(self, arch): |
| 4690 | - series = self.config["DIST"] |
| 4691 | cpuarch = arch.split("+")[0] |
| 4692 | if cpuarch == "powerpc": |
| 4693 | # https://lists.ubuntu.com/archives/ubuntu-announce/2007-February/ |
| 4694 | # 000098.html |
| 4695 | - if series > "edgy": |
| 4696 | - return True |
| 4697 | + return True |
| 4698 | elif cpuarch == "sparc": |
| 4699 | # https://lists.ubuntu.com/archives/ubuntu-devel-announce/ |
| 4700 | # 2008-March/000400.html |
| 4701 | - if series < "dapper" or series > "gutsy": |
| 4702 | - return True |
| 4703 | + return True |
| 4704 | elif cpuarch in ( |
| 4705 | - "arm64", "armel", "armhf", "hppa", "ia64", "lpia", "ppc64el", |
| 4706 | + "arm64", "armel", "armhf", "hppa", "ia64", "ppc64el", |
| 4707 | "s390x"): |
| 4708 | return True |
| 4709 | return False |
| 4710 | @@ -2377,17 +2244,14 @@ |
| 4711 | for arch in arches: |
| 4712 | if image_base.endswith("-%s" % arch): |
| 4713 | matches = True |
| 4714 | - elif (self.config.project in ("ubuntu-touch", |
| 4715 | - "ubuntu-touch-custom") and |
| 4716 | + elif (self.config.project == "ubuntu-touch" and |
| 4717 | arch == "armhf" and |
| 4718 | ("-armel+" in image_base or "-armhf+" in image_base)): |
| 4719 | matches = True |
| 4720 | - elif (self.config.project in ("ubuntu-touch", |
| 4721 | - "ubuntu-touch-custom") and |
| 4722 | + elif (self.config.project == "ubuntu-touch" and |
| 4723 | arch == "i386" and "-i386+" in image_base): |
| 4724 | matches = True |
| 4725 | - elif (self.config.project in ("ubuntu-touch", |
| 4726 | - "ubuntu-touch-custom") and |
| 4727 | + elif (self.config.project == "ubuntu-touch" and |
| 4728 | arch == "arm64" and "-arm64+" in image_base): |
| 4729 | matches = True |
| 4730 | elif self.config.subproject == "wubi" and image_base == arch: |
| 4731 | @@ -2805,18 +2669,13 @@ |
| 4732 | """An object that can publish daily builds of the Chinese edition.""" |
| 4733 | |
| 4734 | def image_output(self, arch): |
| 4735 | - if self.config["DIST"] < "oneiric": |
| 4736 | - return os.path.join( |
| 4737 | - self.config.root, "scratch", "ubuntu-chinese-edition", |
| 4738 | - self.config.full_series) |
| 4739 | - else: |
| 4740 | - project = "ubuntu" |
| 4741 | - if self.config["UBUNTU_DEFAULTS_LOCALE"]: |
| 4742 | - project = "-".join([ |
| 4743 | - project, self.config["UBUNTU_DEFAULTS_LOCALE"]]) |
| 4744 | - return os.path.join( |
| 4745 | - self.config.root, "scratch", project, self.config.full_series, |
| 4746 | - self.image_type, "live") |
| 4747 | + project = "ubuntu" |
| 4748 | + if self.config["UBUNTU_DEFAULTS_LOCALE"]: |
| 4749 | + project = "-".join([ |
| 4750 | + project, self.config["UBUNTU_DEFAULTS_LOCALE"]]) |
| 4751 | + return os.path.join( |
| 4752 | + self.config.root, "scratch", project, self.config.full_series, |
| 4753 | + self.image_type, "live") |
| 4754 | |
| 4755 | @property |
| 4756 | def source_extension(self): |
| 4757 | @@ -2842,8 +2701,7 @@ |
| 4758 | |
| 4759 | def tree_suffix(self, source): |
| 4760 | # Publish ports/daily to ports/releases/..., etc. |
| 4761 | - ubuntu_projects = ( |
| 4762 | - "ubuntu-server", "ubuntu-netbook", "ubuntu-mid", "ubuntu-headless") |
| 4763 | + ubuntu_projects = ("ubuntu-server", ) |
| 4764 | if "/" in source: |
| 4765 | project, tail = source.split("/", 1) |
| 4766 | if project in ubuntu_projects: |
| 4767 | @@ -2980,10 +2838,7 @@ |
| 4768 | def daily_base(self, source, date, publish_type, arch): |
| 4769 | series = self.config["DIST"] |
| 4770 | daily_dir = self.daily_dir(source, date, publish_type) |
| 4771 | - if publish_type in ("netbook", "mid") and series <= "intrepid": |
| 4772 | - return os.path.join( |
| 4773 | - daily_dir, "%s-%s" % (self.project, publish_type)) |
| 4774 | - elif publish_type == "wubi": |
| 4775 | + if publish_type == "wubi": |
| 4776 | return os.path.join(daily_dir, arch) |
| 4777 | else: |
| 4778 | return os.path.join( |
| 4779 | @@ -3147,7 +3002,7 @@ |
| 4780 | |
| 4781 | def want_manifest(self, publish_type, path): |
| 4782 | if publish_type in ( |
| 4783 | - "live", "desktop", "netbook", "mid", "moblin-remix", |
| 4784 | + "live", "desktop", "netbook", |
| 4785 | "uec", "server-uec", "core", "wubi", "server", "live-server", |
| 4786 | ): |
| 4787 | return True |
| 4788 | @@ -3166,7 +3021,7 @@ |
| 4789 | def want_metalink(self, publish_type): |
| 4790 | # TODO: maybe others? metalink is only supported for Wubi |
| 4791 | if publish_type in ( |
| 4792 | - "netbook", "mid", "moblin-remix", "uec", "server-uec", |
| 4793 | + "netbook", "uec", "server-uec", |
| 4794 | ): |
| 4795 | return False |
| 4796 | elif publish_type.startswith("preinstalled-"): |
| 4797 | @@ -3364,14 +3219,12 @@ |
| 4798 | |
| 4799 | # Override the architecture list for these types unconditionally. |
| 4800 | # TODO: should reset default-arches for the source project instead |
| 4801 | - if (publish_type in ("netbook", "moblin-remix") and |
| 4802 | + if (publish_type == "netbook" and |
| 4803 | not [arch for arch in arches if arch.startswith("armel")]): |
| 4804 | arches = ["i386"] |
| 4805 | - elif publish_type == "mid": |
| 4806 | - arches = ["lpia"] |
| 4807 | |
| 4808 | # Sanity-check. |
| 4809 | - if publish_type not in ("netbook", "mid", "src"): |
| 4810 | + if publish_type not in ("netbook", "src"): |
| 4811 | for arch in arches: |
| 4812 | paths = [] |
| 4813 | for ext in ("iso", "img", "img.gz", "img.xz", "img.tar.gz", |
Looking good for the first iteration, I guess this should be good to go. I included one nitpick inline comment below, but that's actually so small that we should just ignore and merge.
I guess with some next iteration I'd like to see all the unneeded projects gone, like ubuntu-touch (maybe a separate one for that?), kubuntu-active, kubuntu-netbook etc.
There's also many places in the tests (like test_config.py) where the old series are used, but that seems low-priority.
Anyway, unit-tests seem to be passing so I think this should be good to go. +1