#799 Remove name from live media tasks
Closed 4 years ago by mohanboddu. Opened 4 years ago by mohanboddu.
mohanboddu/pungi-fedora remove-name  into  master

file modified
+2 -19
@@ -473,7 +473,6 @@ 

  live_media = {

      '^Workstation$': [

              {

-                 'name': 'Fedora-Workstation-Live',

                  'kickstart': 'fedora-live-workstation.ks',

                  'arches': ['x86_64', 'ppc64le'],

                  'failable': ['ppc64le'],
@@ -485,7 +484,6 @@ 

          ],

      '^Spins': [

              {

-                 'name': 'Fedora-KDE-Live',

                  'kickstart': 'fedora-live-kde.ks',

                  'arches': ['x86_64'],

                  'repo': 'Everything',
@@ -494,7 +492,6 @@ 

  

              },

              {

-                 'name': 'Fedora-Xfce-Live',

                  'kickstart': 'fedora-live-xfce.ks',

                  'arches': ['x86_64'],

                  'failable': ['*'],
@@ -503,7 +500,6 @@ 

                  'subvariant': 'Xfce'

              },

              {

-                 'name': 'Fedora-SoaS-Live',

                  'kickstart': 'fedora-live-soas.ks',

                  'arches': ['x86_64'],

                  'failable': ['*'],
@@ -512,7 +508,6 @@ 

                  'subvariant': 'SoaS'

              },

              {

-                 'name': 'Fedora-Cinnamon-Live',

                  'kickstart': 'fedora-live-cinnamon.ks',

                  'arches': ['x86_64'],

                  'failable': ['*'],
@@ -521,7 +516,6 @@ 

                  'subvariant': 'Cinnamon'

              },

              {

-                 'name': 'Fedora-LXDE-Live',

                  'kickstart': 'fedora-live-lxde.ks',

                  'arches': ['x86_64'],

                  'failable': ['*'],
@@ -530,16 +524,14 @@ 

                  'subvariant': 'LXDE'

              },

              {

-                 'name': 'Fedora-MATE_Compiz-Live',

                  'kickstart': 'fedora-live-mate_compiz.ks',

                  'arches': ['x86_64'],

                  'failable': ['*'],

                  'repo': 'Everything',

                  'install_tree_from': 'Everything',

-                 'subvariant': 'Mate'

+                 'subvariant': 'Mate_Compiz'

I'm not sure I like that. Changing the subvariant name is pretty close to declaring this is a different image than it was before (and will need changes to relval at least). Also the capitalization is different from the old name so the image file names will still be different. I'd argue it's better to keep the subvariant name and let the file names change than to change the subvariant name to try and make the filenames match.

              },

              {

-                 'name': 'Fedora-LXQt-Live',

                  'kickstart': 'fedora-live-lxqt.ks',

                  'arches': ['x86_64'],

                  'failable': ['*'],
@@ -550,7 +542,6 @@ 

          ],

      '^Labs$': [

              {

-                 'name': 'Fedora-Astronomy_KDE-Live',

                  'kickstart': 'fedora-live-astronomy_kde.ks',

                  'arches': ['x86_64'],

                  'failable': ['*'],
@@ -559,7 +550,6 @@ 

                  'subvariant': 'Astronomy_KDE'

              },

              {

-                 'name': 'Fedora-Comp_Neuro-Live',

                  'kickstart': 'fedora-live-comp_neuro.ks',

                  'arches': ['x86_64'],

                  'failable': ['*'],
@@ -568,7 +558,6 @@ 

                  'subvariant': 'Comp_Neuro'

              },

              {

-                 'name': 'Fedora-Design_suite-Live',

                  'kickstart': 'fedora-live-design_suite.ks',

                  'arches': ['x86_64'],

                  'failable': ['*'],
@@ -577,7 +566,6 @@ 

                  'subvariant': 'Design_suite'

              },

              {

-                 'name': 'Fedora-Scientific_KDE-Live',

                  'kickstart': 'fedora-live-scientific_kde.ks',

                  'arches': ['x86_64'],

                  'failable': ['*'],
@@ -586,7 +574,6 @@ 

                  'subvariant': 'Scientific_KDE'

              },

              {

-                 'name': 'Fedora-Games-Live',

                  'kickstart': 'fedora-live-games.ks',

                  'arches': ['x86_64'],

                  'failable': ['*'],
@@ -595,7 +582,6 @@ 

                  'subvariant': 'Games'

              },

              {

-                 'name': 'Fedora-Security-Live',

                  'kickstart': 'fedora-live-security.ks',

                  'arches': ['x86_64'],

                  'failable': ['*'],
@@ -604,7 +590,6 @@ 

                  'subvariant': 'Security'

              },

              {

-                 'name': 'Fedora-Jam_KDE-Live',

                  'kickstart': 'fedora-live-jam_kde.ks',

                  'arches': ['x86_64'],

                  'failable': ['*'],
@@ -613,7 +598,6 @@ 

                  'subvariant': 'Jam_KDE'

              },

              {

-                 'name': 'Fedora-Robotics-Live',

                  'kickstart': 'fedora-live-robotics.ks',

                  'arches': ['x86_64'],

                  'failable': ['*'],
@@ -622,13 +606,12 @@ 

                  'subvariant': 'Robotics'

              },

              {

-                 'name': 'Fedora-Python-Classroom-Live',

                  'kickstart': 'fedora-live-python-classroom.ks',

                  'arches': ['x86_64'],

                  'failable': ['*'],

                  'repo': 'Everything',

                  'install_tree_from': 'Everything',

-                 'subvariant': 'Python_Classroom'

+                 'subvariant': 'Python-Classroom'

Ditto with the above. Also I'm not sure it's actually legal to have a - in a subvariant name. Even if it is it probably shouldn't be.

              }

      ],

  }

Name is being passed as title to lorax and lorax removed --title
option.

More info at: https://pagure.io/releng/failed-composes/issue/562

Signed-off-by: Mohan Boddu mboddu@bhujji.com

I'm not sure I like that. Changing the subvariant name is pretty close to declaring this is a different image than it was before (and will need changes to relval at least). Also the capitalization is different from the old name so the image file names will still be different. I'd argue it's better to keep the subvariant name and let the file names change than to change the subvariant name to try and make the filenames match.

Ditto with the above. Also I'm not sure it's actually legal to have a - in a subvariant name. Even if it is it probably shouldn't be.

It seems productmd doesn't actually ban - in subvariant names, but my old naming policy did:

https://fedoraproject.org/wiki/User:Adamwill/Draft_fedora_image_naming_policy

and we don't actually have any subvariants with - in them right now, and doing it is ambiguous, so...can we not? :)

Looking into this a bit more - it seems this PR was sent in relation to https://pagure.io/releng/failed-composes/issue/562, but if the assumption was that this 'name' value is only used to generate --title, I don't think that's right. It's used to produce other args too. Just ripping it out seems wrong.

I think the correct fix would be to patch koji here. That's where the --title arg is added. That's what https://pagure.io/koji/pull-request/1781 does, so I think with that, there is no need to do this at all.

While this change can shorted the configuration, it will not change anything with regards to the --title change. The koji patch will still be required, and it will be sufficient even without this change.

The main purpose of the name is to map the task to a package in Koji, so if name changes, a new package will have to be created in Koji. I don't know if that happens automatically or requires manual intervention.
Example: https://koji.fedoraproject.org/koji/packageinfo?packageID=22090

It does also affect the image file name, as I thought, so if we take it out of the config that'll change (if it even works - is it actually valid to not have this?)

The main purpose of the name is to map the task to a package in Koji, so if name changes, a new package will have to be created in Koji. I don't know if that happens automatically or requires manual intervention.

This is a manual step, we add the package to koji.

Looking into this a bit more - it seems this PR was sent in relation to https://pagure.io/releng/failed-composes/issue/562, but if the assumption was that this 'name' value is only used to generate --title, I don't think that's right. It's used to produce other args too. Just ripping it out seems wrong.

So, since it affects other stuff, we cannot simply change the sub_variant (I thought it wont be a major thing). I guess what we can do is, add the new package name (as it will generate with the current config) to koji. That means, the image names will be different, which means @adamwill has to make some changes to OpenQA, is that okay?

What? I can't parse that.

AFAICS, all we need to do here is apply your koji patch so koji doesn't produce a --title arg any more. That should be all that needs changing and it should not result in any changes to image file names or metadata. I do not see that we need to change anything here (in pungi-fedora) at all. Am I missing something?

It does also affect the image file name, as I thought, so if we take it out of the config that'll change (if it even works - is it actually valid to not have this?)

If not specified, Pungi will default to {release_name}-{subvariant}-Live, so this could make the config a little shorter.

AFAICS, all we need to do here is apply your koji patch so koji doesn't produce a --title arg any more. That should be all that needs changing and it should not result in any changes to image file names or metadata. I do not see that we need to change anything here (in pungi-fedora) at all. Am I missing something?

I believe this assessment to be correct and not missing anything.

If not specified, Pungi will default to {release_name}-{subvariant}-Live, so this could make the config a little shorter.

Right, but closing this as this is not required anymore.

Pull-Request has been closed by mohanboddu

4 years ago
Metadata