pungi-fedora

Clone

#525 rawhide: workaround temporary volid issue
Merged 6 years ago by ausil. Opened 6 years ago by dustymabe.
dustymabe/pungi-fedora dusty-volid  into  master

file modified
+3 -1 
@@ -235,6 +235,8 @@ 
 

  # 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.
 

+ # '-Workstation-' is a temporary workaround. See
 

+ # https://pagure.io/pungi-fedora/pull-request/525
 

  volume_id_substitutions = {
 

             'Atomic': 'AH',
 

            'Rawhide': 'rawh',
 
@@ -249,7 +251,7 @@ 
 

              'Games': 'Game',
 

            'Jam_KDE': 'Jam',
 

  'WorkstationOstree': 'WS',
 

-       'Workstation': 'WS',
 

+     '-Workstation-': '-WS-',
 

         'Everything': 'E',
 

             'Server': 'S',
 

              'Cloud': 'C',

We've been seeing failures in rawhide [1] because the full
word WorkstationOstree doesn't get matched properly in
pungi [2]. Let's workaround this issue until pungi gets
fixed.

[1] https://pagure.io/dusty/failed-composes/issue/2#comment-494497
[2] https://pagure.io/pungi/issue/840

Signed-off-by: Dusty Mabe dusty@dustymabe.com

rebased onto 112565eede6dd14c087f3202953ad3712bd24054
6 years ago

rebased onto 48a5c28eaaff6ef40ad49df1694cfd01d13ef5a1
6 years ago

we are renaming WorkstationOstree to AtomicWorkstation right?

we are renaming WorkstationOstree to AtomicWorkstation right?

That is the plan once I rework #498 . I don't think doing that will solve this problem though because we'd end up with a substituion of AtomicWS instead of what we have today of WSOstree. Either one of those will put us above the 32 character limit.

I'll rebase this again because I see some other stuff was merged.

rebased onto dd3042333e99ad42bccdf098a644bb83a80a0959
6 years ago

we are renaming WorkstationOstree to AtomicWorkstation right?

That is the plan once I rework #498 . I don't think doing that will solve this problem though because we'd end up with a substituion of AtomicWS instead of what we have today of WSOstree. Either one of those will put us above the 32 character limit.

And actually, considering we want to go to AtomicWorkstation I should probably update this PR to be even more greedy. Maybe -Workstation-: -WS-.

And actually, considering we want to go to AtomicWorkstation I should probably update this PR to be even more greedy. Maybe -Workstation-: -WS-.

I pushed up that change ^^ as well. Now I'm going to go grab some media and check to make sure that's the actual volid that Workstation media gets.

rebased onto 3ea4eb2
6 years ago

Yes it looks like the volid of the released 27 workstation ISO was LABEL="Fedora-WS-Live-27-1-6". So It looks like -Workstation- : -WS' should work unless pungi explicitly won't match dashes.

:thumbsup: this looks fine to me. I checked fedfind's capacious databanks and don't think we've ever had a non-Atomic ISO which had Workstation in its filename but not -Workstation-. Also checked how the substitutions are applied and I don't see any issues there.

Pull-Request has been merged by ausil
6 years ago

This should work well. Pungi does not care about dashes in the value at all, it just replaces string values. The problem is that it takes them in non-well defined order, so if one pattern is a substring of another the shorter one could be used. This PR should nicely avoid that.
Metadata
None
No Tags
Changes Summary 1
+3 -1
file changed
fedora.conf
Powered by Pagure 5.13.3
Documentation • File an Issue • About • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.