Merge ubuntu-archive-tools:no-more-source-isos into ubuntu-archive-tools:main

Proposed by Steve Langasek
Status: Needs review
Proposed branch: ubuntu-archive-tools:no-more-source-isos
Merge into: ubuntu-archive-tools:main
Diff against target: 51 lines (+2/-10)
1 file modified
publish-image-set (+2/-10)
Reviewer Review Type Date Requested Status
Ubuntu Release Team Pending
Review via email: mp+459691@code.launchpad.net
To post a comment you must log in.

Unmerged commits

2a2e638... by Steve Langasek

No longer (attempt to) publish source ISOs.

cron.source is dropped now from ubuntu-cdimage by agreement, so there's
nothing for us to publish during milestones.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/publish-image-set b/publish-image-set
index d43ca3a..9e1a949 100755
--- a/publish-image-set
+++ b/publish-image-set
@@ -28,7 +28,7 @@
28# <dir>: daily or daily-live, dir on cdimage.u.c./28# <dir>: daily or daily-live, dir on cdimage.u.c./
29# <buildstamp>: e. g. 20070605.3; ubuntu-server/daily/<timestamp> for29# <buildstamp>: e. g. 20070605.3; ubuntu-server/daily/<timestamp> for
30# server/netbook/etc.30# server/netbook/etc.
31# <type>: desktop/alternate/server/serveraddon/src31# <type>: desktop/alternate/server/serveraddon
32# <releaseflag>: yes/no/poolonly/named (should appear on releases.u.c.?)32# <releaseflag>: yes/no/poolonly/named (should appear on releases.u.c.?)
33# <name>: name of the release (alpha-2, beta, etc.)33# <name>: name of the release (alpha-2, beta, etc.)
3434
@@ -61,7 +61,6 @@ product_re = re.compile(
61type_map = {61type_map = {
62 'desktop': 'daily-live',62 'desktop': 'daily-live',
63 'alternate': 'daily',63 'alternate': 'daily',
64 'src': 'source',
65 'dvd': 'dvd',64 'dvd': 'dvd',
66 'mobile': 'daily-live',65 'mobile': 'daily-live',
67 'active': 'daily-live',66 'active': 'daily-live',
@@ -248,8 +247,7 @@ def do_publish_release(opts, project, type, buildstamp, arches, milestone,
248 return247 return
249248
250 cmd = ['for-project', project, 'publish-release']249 cmd = ['for-project', project, 'publish-release']
251 if type != 'src':250 cmd.insert(0, "ARCHES='%s'" % ' '.join(sorted(arches)))
252 cmd.insert(0, "ARCHES='%s'" % ' '.join(sorted(arches)))
253 if stable is not None:251 if stable is not None:
254 cmd.insert(0, "DIST=%s" % stable)252 cmd.insert(0, "DIST=%s" % stable)
255253
@@ -311,19 +309,13 @@ def main():
311 print('cd ~/cdimage/; rm -rf www.prev; cp -al www www.prev; cd www')309 print('cd ~/cdimage/; rm -rf www.prev; cp -al www www.prev; cd www')
312310
313 print('\n## publish images:')311 print('\n## publish images:')
314 source_milestone = None
315 for project, builds in list(info['build_map'].items()):312 for project, builds in list(info['build_map'].items()):
316 for type, buildstamps in list(builds.items()):313 for type, buildstamps in list(builds.items()):
317 for buildstamp, arches in list(buildstamps.items()):314 for buildstamp, arches in list(buildstamps.items()):
318 do_publish_release(opts, project, type, buildstamp, arches,315 do_publish_release(opts, project, type, buildstamp, arches,
319 info['milestone_code'], info['stable'])316 info['milestone_code'], info['stable'])
320 source_milestone = info['milestone_code']
321 print()317 print()
322318
323 if source_milestone:
324 do_publish_release(opts, 'ubuntu', 'src', 'current', set(),
325 source_milestone, info['stable'])
326
327 if not opts.prepublish:319 if not opts.prepublish:
328 print('\n## fix name in headers:')320 print('\n## fix name in headers:')
329 print("find full -path '*/%s*HEADER.html' | "321 print("find full -path '*/%s*HEADER.html' | "

Subscribers

People subscribed via source and target branches