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
1diff --git a/publish-image-set b/publish-image-set
2index d43ca3a..9e1a949 100755
3--- a/publish-image-set
4+++ b/publish-image-set
5@@ -28,7 +28,7 @@
6 # <dir>: daily or daily-live, dir on cdimage.u.c./
7 # <buildstamp>: e. g. 20070605.3; ubuntu-server/daily/<timestamp> for
8 # server/netbook/etc.
9-# <type>: desktop/alternate/server/serveraddon/src
10+# <type>: desktop/alternate/server/serveraddon
11 # <releaseflag>: yes/no/poolonly/named (should appear on releases.u.c.?)
12 # <name>: name of the release (alpha-2, beta, etc.)
13
14@@ -61,7 +61,6 @@ product_re = re.compile(
15 type_map = {
16 'desktop': 'daily-live',
17 'alternate': 'daily',
18- 'src': 'source',
19 'dvd': 'dvd',
20 'mobile': 'daily-live',
21 'active': 'daily-live',
22@@ -248,8 +247,7 @@ def do_publish_release(opts, project, type, buildstamp, arches, milestone,
23 return
24
25 cmd = ['for-project', project, 'publish-release']
26- if type != 'src':
27- cmd.insert(0, "ARCHES='%s'" % ' '.join(sorted(arches)))
28+ cmd.insert(0, "ARCHES='%s'" % ' '.join(sorted(arches)))
29 if stable is not None:
30 cmd.insert(0, "DIST=%s" % stable)
31
32@@ -311,19 +309,13 @@ def main():
33 print('cd ~/cdimage/; rm -rf www.prev; cp -al www www.prev; cd www')
34
35 print('\n## publish images:')
36- source_milestone = None
37 for project, builds in list(info['build_map'].items()):
38 for type, buildstamps in list(builds.items()):
39 for buildstamp, arches in list(buildstamps.items()):
40 do_publish_release(opts, project, type, buildstamp, arches,
41 info['milestone_code'], info['stable'])
42- source_milestone = info['milestone_code']
43 print()
44
45- if source_milestone:
46- do_publish_release(opts, 'ubuntu', 'src', 'current', set(),
47- source_milestone, info['stable'])
48-
49 if not opts.prepublish:
50 print('\n## fix name in headers:')
51 print("find full -path '*/%s*HEADER.html' | "

Subscribers

People subscribed via source and target branches