PR#535: Volume ID substitution fixups from master - pungi-fedora

pungi-fedora

#535 Volume ID substitution fixups from master

Merged 6 years ago by ausil. Opened 6 years ago by adamwill.

adamwill/pungi-fedora update-substitutions-f28 into f28

Update the volume ID substitutions list

Adam Williamson • 6 years ago

740fa08

rawhide: workaround temporary volid issue

Dusty Mabe • 6 years ago

0aef13f

fedora.conf

file modified

+30 -21

		`@@ -236,28 +236,37 @@`
		`]`
		`# No special handling for layered products, use same format as for regular images`
		`image_volid_layered_product_formats = []`
		`- # Replace 'Cloud' with 'C' in volume id etc.`
		`+ # Used by Pungi to replace 'Cloud' with 'C' (etc.) in ISO volume IDs.`
		`+ # There is a hard 32-character limit on ISO volume IDs, so we use`
		`+ # these to try and produce short enough but legible IDs. Note this is`
		`+ # duplicated in Koji for live images, as livemedia-creator does not`
		`+ # allow Pungi to tell it what volume ID to use. Note:`
		`+ # https://fedoraproject.org/wiki/User:Adamwill/Draft_fedora_image_naming_policy`
		`+ # '-Workstation-' is a temporary workaround. See`
		`+ # https://pagure.io/pungi-fedora/pull-request/525`
		`volume_id_substitutions = {`
		`- 'Atomic': 'AH',`
		`- 'Rawhide': 'rawh',`
		`- 'Images': 'img',`
		`- 'MATE_Compiz': 'MATE',`
		`- 'Security': 'Sec',`
		`- 'Electronic_Lab': 'Elec',`
		`- 'Robotics': 'Robo',`
		`- 'Scientific_KDE': 'SciK',`
		`- 'Astronomy_KDE': 'AstK',`
		`- 'Design_suite': 'Dsgn',`
		`- 'Games': 'Game',`
		`- 'Jam_KDE': 'Jam',`
		`- 'WorkstationOstree': 'WS',`
		`- 'Workstation': 'WS',`
		`- 'Everything': 'E',`
		`- 'Server': 'S',`
		`- 'Cloud': 'C',`
		`- 'Alpha': 'A',`
		`- 'Beta': 'B',`
		`- 'TC': 'T',`
		`+ 'Beta': 'B',`
		`+ 'Rawhide': 'rawh',`
		`+ 'Astronomy_KDE': 'AstK',`
		`+ 'Atomic': 'AH',`
		`+ 'Cinnamon': 'Cinn',`
		`+ 'Cloud': 'C',`
		`+ 'Design_suite': 'Dsgn',`
		`+ 'Electronic_Lab': 'Elec',`
		`+ 'Everything': 'E',`
		`+ 'Games': 'Game',`
		`+ 'Images': 'img',`
		`+ 'Jam_KDE': 'Jam',`
		`+ 'MATE_Compiz': 'MATE',`
		`+ # Note https://pagure.io/pungi-fedora/issue/533`
		`+ 'Python-Classroom': 'Clss',`
		`+ 'Python_Classroom': 'Clss',`
		`+ 'Robotics': 'Robo',`
		`+ 'Scientific_KDE': 'SciK',`
		`+ 'Security': 'Sec',`
		`+ 'Server': 'S',`
		`+ '-Workstation-': '-WS-',`
		`+ 'WorkstationOstree': 'WS',`
		`}`

		`disc_types = {`