commit 89c95f0a43e96e228e4d2524c0fc62ae12cc27e1 Author: Stephen Gallagher sgallagh@redhat.com Date: Mon Nov 24 08:46:53 2014 -0500
Work around pungi issue with productimg packages
Pungi and lorax pull in the complete repository set and then try to load all possible fedora-productimg-* packages. We need to explicitly exclude the ones for the different products.
fedora-install-cloud.ks | 8 ++++---- fedora-install-server.ks | 8 ++++---- fedora-install-workstation.ks | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) --- diff --git a/fedora-install-cloud.ks b/fedora-install-cloud.ks index 0bb9fac..ddddef3 100644 --- a/fedora-install-cloud.ks +++ b/fedora-install-cloud.ks @@ -16,12 +16,12 @@ # use the source repo, we can't just include fedora-repo.ks
# In the master branch the rawhide repo commands should be uncommented. -#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch -#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$ba... +#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-workstation,fedora-productimg-server +#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$ba... --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
# In non-master branches the fedora repo commands should be uncommented -repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch... -repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&a... +repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch... --excludepkgs=fedora-productimg-workstation,fedora-productimg-server +repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&a... --excludepkgs=fedora-productimg-workstation,fedora-productimg-server
# Package manifest for the compose. Uses repo group metadata to translate groups. # (default groups for the configured repos are added by --default) diff --git a/fedora-install-server.ks b/fedora-install-server.ks index 5100e68..4897ac7 100644 --- a/fedora-install-server.ks +++ b/fedora-install-server.ks @@ -16,12 +16,12 @@ # use the source repo, we can't just include fedora-repo.ks
# In the master branch the rawhide repo commands should be uncommented. -#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch -#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$ba... +#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation +#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$ba... --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
# In non-master branches the fedora repo commands should be uncommented -repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch... -repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&a... +repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch... --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation +repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&a... --excludepkgs=fedora-productimg-cloud,fedora-productimg-workstation
# Package manifest for the compose. Uses repo group metadata to translate groups. # (default groups for the configured repos are added by --default) diff --git a/fedora-install-workstation.ks b/fedora-install-workstation.ks index 2182e08..f8cb8df 100644 --- a/fedora-install-workstation.ks +++ b/fedora-install-workstation.ks @@ -16,12 +16,12 @@ # use the source repo, we can't just include fedora-repo.ks
# In the master branch the rawhide repo commands should be uncommented. -#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch -#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$ba... +#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch --excludepkgs=fedora-productimg-cloud,fedora-productimg-server +#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$ba... --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
# In non-master branches the fedora repo commands should be uncommented -repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch... -repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&a... +repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch... --excludepkgs=fedora-productimg-cloud,fedora-productimg-server +repo --name=fedora-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&a... --excludepkgs=fedora-productimg-cloud,fedora-productimg-server
%include fedora-workstation-packages.ks
On Mon, Nov 24, 2014 at 18:34:12 +0000, Stephen Gallagher sgallagh@fedoraproject.org wrote:
Work around pungi issue with productimg packages
Pungi and lorax pull in the complete repository set and then try to load all possible fedora-productimg-* packages. We need to explicitly exclude the ones for the different products. # In the master branch the rawhide repo commands should be uncommented. -#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch -#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$ba...
Did you test using a - line in the kickstart files? That used to work properly for this, and if it doesn't it would be nice to make it work again. (And there might be other issues with extra kernel packages getting included.)
Doing this is the repo commands isn't a good idea, as those are often overridden when doing composes and the overrides may not have the excludes in them.
If this actually works for final composes, then I'd suggest that we leave it as is until after gold for the f21 branch as there isn't much time to mess around with stuff.
On Mon, 2014-11-24 at 12:52 -0600, Bruno Wolff III wrote:
On Mon, Nov 24, 2014 at 18:34:12 +0000, Stephen Gallagher sgallagh@fedoraproject.org wrote:
Work around pungi issue with productimg packages
Pungi and lorax pull in the complete repository set and then try to load all possible fedora-productimg-* packages. We need to explicitly exclude the ones for the different products. # In the master branch the rawhide repo commands should be uncommented. -#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch -#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$ba...
Did you test using a - line in the kickstart files? That used to work properly for this, and if it doesn't it would be nice to make it work again. (And there might be other issues with extra kernel packages getting included.)
I did not (could you point me to a reference to what a - line is/does)?
Doing this is the repo commands isn't a good idea, as those are often overridden when doing composes and the overrides may not have the excludes in them.
It's a hack, plain and simple. We're out of time and Brian Lane indicated[1] that this would work around some pungi/lorax interactions to get this to work.
If this actually works for final composes, then I'd suggest that we leave it as is until after gold for the f21 branch as there isn't much time to mess around with stuff.
I believe it will (and if it doesn't, things should still fall back to using the non-branded images), so I've landed this in spin-kickstarts so we can get TC4 built with them. We have an agreement between QA, rel-eng and dev that if this doesn't work in TC4, we're pulling out the per-product branding and will rework it for F22. I'm going to be requesting a compose of TC4 tonight.
On Mon, Nov 24, 2014 at 02:04:01PM -0500, Stephen Gallagher wrote:
On Mon, 2014-11-24 at 12:52 -0600, Bruno Wolff III wrote:
On Mon, Nov 24, 2014 at 18:34:12 +0000, Stephen Gallagher sgallagh@fedoraproject.org wrote:
Work around pungi issue with productimg packages
Pungi and lorax pull in the complete repository set and then try to load all possible fedora-productimg-* packages. We need to explicitly exclude the ones for the different products. # In the master branch the rawhide repo commands should be uncommented. -#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch -#repo --name=rawhide-source --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$ba...
Did you test using a - line in the kickstart files? That used to work properly for this, and if it doesn't it would be nice to make it work again. (And there might be other issues with extra kernel packages getting included.)
I did not (could you point me to a reference to what a - line is/does)?
It removes a package. It will only work with things that properly parse a kickstart (like anaconda). For the pungi use case pungi is passing the yum object on to Lorax so none of the kickstart has any effect except for the repo --excludepkgs argument.
Doing this is the repo commands isn't a good idea, as those are often overridden when doing composes and the overrides may not have the excludes in them.
It's a hack, plain and simple. We're out of time and Brian Lane indicated[1] that this would work around some pungi/lorax interactions to get this to work.
Yep. For F22 it may be better to drop the 'load them all' from Lorax and let pungi figure it out and add a template snippet to its Lorax call. But that's not going to happen for 21.
If this actually works for final composes, then I'd suggest that we leave it as is until after gold for the f21 branch as there isn't much time to mess around with stuff.
I believe it will (and if it doesn't, things should still fall back to using the non-branded images), so I've landed this in spin-kickstarts so we can get TC4 built with them. We have an agreement between QA, rel-eng and dev that if this doesn't work in TC4, we're pulling out the per-product branding and will rework it for F22. I'm going to be requesting a compose of TC4 tonight.
I ran a pungi build on Friday with a local repo containing all 3 fedora-productimg-*rpm files and the modified Lorax. It correctly produced a Server branded DVD for me.