f19 mass branching

[Dennis Gilmore]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi All,

F19 has been branched, please be sure to do a git pull --rebase to pick
up the new branch, additionally rawhide/f20 has had inheritance cut off
from previous releases,  so this means that anything you do for f19 you
also have to do in the master branch and do a build there.

Dennis
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v2.0.19 (GNU/Linux)
>
> iEYEARECAAYFAlE/SfkACgkQkSxm47BaWfcN1wCguWnZhlA7wwIRD5rUm/s8gnk1
> DFQAniCIITZodm/r3xkw+aOz227+AFYH
> =da30
> -----END PGP SIGNATURE-----

_______________________________________________
devel-announce mailing list
[e-mail]
https://admin.fedoraproject.org/mailman/listinfo/devel-announce

[Vít Ondruch]

Dne 12.3.2013 16:30, Dennis Gilmore napsal(a):
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hi All,
>
> F19 has been branched, please be sure to do a git pull --rebase to pick
> up the new branch, additionally rawhide/f20 has had inheritance cut off
> from previous releases,  so this means that anything you do for f19 you
> also have to do in the master branch and do a build there.

Why was it cut off so soon actually? The reason for disabling 
inheritance was due to Bodhi updates, which might not go stable, if I 
remember correctly, but Bodhi is not in action yet I suppose, so the cut 
of was too soon IMO. Could you please reconsider it? Thank you.

Vít

[Peter Robinson]

On Wed, Mar 13, 2013 at 8:25 AM, Vít Ondruch  wrote:
> Dne 12.3.2013 16:30, Dennis Gilmore napsal(a):
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> >
> > Hi All,
> >
> > F19 has been branched, please be sure to do a git pull --rebase to pick
> > up the new branch, additionally rawhide/f20 has had inheritance cut off
> > from previous releases,  so this means that anything you do for f19 you
> > also have to do in the master branch and do a build there.
>
> Why was it cut off so soon actually? The reason for disabling inheritance
> was due to Bodhi updates, which might not go stable, if I remember
> correctly, but Bodhi is not in action yet I suppose, so the cut of was too
> soon IMO. Could you please reconsider it? Thank you.

No, branching is the correct time to do it. Mandated tagging through
koji and inheritance are completely unrelated. At the moment koji tags
the packages straight into f19 rather than tagging to
f19-updates-candidate and having bodhi deal with the tagging.

Inheritance only affect whether something is built in f19 is inherited
through to rawhide. There was a discussion some time ago about this so
presumably this change was either a decision by release engineering or
FESCo.

Peter

[Vít Ondruch]

Dne 13.3.2013 10:09, Peter Robinson napsal(a):
> On Wed, Mar 13, 2013 at 8:25 AM, Vít Ondruch  wrote:
> > Dne 12.3.2013 16:30, Dennis Gilmore napsal(a):
> > > -----BEGIN PGP SIGNED MESSAGE-----
> > > Hash: SHA1
> > >
> > > Hi All,
> > >
> > > F19 has been branched, please be sure to do a git pull --rebase to pick
> > > up the new branch, additionally rawhide/f20 has had inheritance cut off
> > > from previous releases,  so this means that anything you do for f19 you
> > > also have to do in the master branch and do a build there.
> >
> > Why was it cut off so soon actually? The reason for disabling inheritance
> > was due to Bodhi updates, which might not go stable, if I remember
> > correctly, but Bodhi is not in action yet I suppose, so the cut of was too
> > soon IMO. Could you please reconsider it? Thank you.
>
> No, branching is the correct time to do it. Mandated tagging through
> koji and inheritance are completely unrelated. At the moment koji tags
> the packages straight into f19 rather than tagging to
> f19-updates-candidate and having bodhi deal with the tagging.
>
> Inheritance only affect whether something is built in f19 is inherited
> through to rawhide. There was a discussion some time ago about this so
> presumably this change was either a decision by release engineering or
> FESCo.

I am afraid that the discussion was more generic, i.e. "Rawhide should 
not inherit from branched Fedora" and since I remember the main reason 
for breaking inheritance was Bodhi and Bodhi is not yet in a game, it 
should be clarified and adjusted.

Vít
> Peter

[Dennis Gilmore]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Wed, 13 Mar 2013 14:03:26 +0100
Vít Ondruch  wrote:
> Dne 13.3.2013 10:09, Peter Robinson napsal(a):
> > On Wed, Mar 13, 2013 at 8:25 AM, Vít Ondruch 
> > wrote:
> > > Dne 12.3.2013 16:30, Dennis Gilmore napsal(a):
> > > > -----BEGIN PGP SIGNED MESSAGE-----
> > > > Hash: SHA1
> > > >
> > > > Hi All,
> > > >
> > > > F19 has been branched, please be sure to do a git pull --rebase
> > > > to pick up the new branch, additionally rawhide/f20 has had
> > > > inheritance cut off from previous releases,  so this means that
> > > > anything you do for f19 you also have to do in the master branch
> > > > and do a build there.
> > >
> > > Why was it cut off so soon actually? The reason for disabling
> > > inheritance was due to Bodhi updates, which might not go stable,
> > > if I remember correctly, but Bodhi is not in action yet I suppose,
> > > so the cut of was too soon IMO. Could you please reconsider it?
> > > Thank you.
> >
> > No, branching is the correct time to do it. Mandated tagging through
> > koji and inheritance are completely unrelated. At the moment koji
> > tags the packages straight into f19 rather than tagging to
> > f19-updates-candidate and having bodhi deal with the tagging.
> >
> > Inheritance only affect whether something is built in f19 is
> > inherited through to rawhide. There was a discussion some time ago
> > about this so presumably this change was either a decision by
> > release engineering or FESCo.
>
> I am afraid that the discussion was more generic, i.e. "Rawhide
> should not inherit from branched Fedora" and since I remember the
> main reason for breaking inheritance was Bodhi and Bodhi is not yet
> in a game, it should be clarified and adjusted.
>
> Vít
> > Peter

https://fedorahosted.org/fesco/ticket/1005
i was asked to cut it at branching time, thats exactly what I did

Dennis
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v2.0.19 (GNU/Linux)
>
> iEYEARECAAYFAlFAfx0ACgkQkSxm47BaWfc8PQCdHIY+RF+TBDXkwHzvX9gHwU3M
> fbgAnj7Qo8HmJgpECTibV2wOzJkhdDil
> =14xW
> -----END PGP SIGNATURE-----

[Vít Ondruch]

Dne 13.3.2013 14:28, Dennis Gilmore napsal(a):
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On Wed, 13 Mar 2013 14:03:26 +0100
> Vít Ondruch  wrote:
> > Dne 13.3.2013 10:09, Peter Robinson napsal(a):
> > > On Wed, Mar 13, 2013 at 8:25 AM, Vít Ondruch 
> > > wrote:
> > > > Dne 12.3.2013 16:30, Dennis Gilmore napsal(a):
> > > > > -----BEGIN PGP SIGNED MESSAGE-----
> > > > > Hash: SHA1
> > > > >
> > > > > Hi All,
> > > > >
> > > > > F19 has been branched, please be sure to do a git pull --rebase
> > > > > to pick up the new branch, additionally rawhide/f20 has had
> > > > > inheritance cut off from previous releases,  so this means that
> > > > > anything you do for f19 you also have to do in the master branch
> > > > > and do a build there.
> > > >
> > > > Why was it cut off so soon actually? The reason for disabling
> > > > inheritance was due to Bodhi updates, which might not go stable,
> > > > if I remember correctly, but Bodhi is not in action yet I suppose,
> > > > so the cut of was too soon IMO. Could you please reconsider it?
> > > > Thank you.
> > >
> > > No, branching is the correct time to do it. Mandated tagging through
> > > koji and inheritance are completely unrelated. At the moment koji
> > > tags the packages straight into f19 rather than tagging to
> > > f19-updates-candidate and having bodhi deal with the tagging.
> > >
> > > Inheritance only affect whether something is built in f19 is
> > > inherited through to rawhide. There was a discussion some time ago
> > > about this so presumably this change was either a decision by
> > > release engineering or FESCo.
> >
> > I am afraid that the discussion was more generic, i.e. "Rawhide
> > should not inherit from branched Fedora" and since I remember the
> > main reason for breaking inheritance was Bodhi and Bodhi is not yet
> > in a game, it should be clarified and adjusted.
> >
> > Vít
> > > Peter
>
> https://fedorahosted.org/fesco/ticket/1005
> i was asked to cut it at branching time, thats exactly what I did

Dennis, I don't blame you, but since you refer the ticket here, I can 
easily quote:
> However, this also means users using branched updates-testing get

newer packages than rawhide,
> and rawhide lags behind on fixes until those updates are promoted

into updates or the base branched
> repo. Sometimes this delay is quite long during freezes.

And this exact point does not apply yet and nobody realized that. I 
opened new ticket for FESCo to re-evaluate it.

Vít

[1] https://fedorahosted.org/fesco/ticket/1099

[Kevin Fenzi]

On Thu, 14 Mar 2013 11:05:27 +0100
Vít Ondruch  wrote:
> Dennis, I don't blame you, but since you refer the ticket here, I can 
> easily quote:
> > However, this also means users using branched updates-testing get
>
> newer packages than rawhide,
> > and rawhide lags behind on fixes until those updates are promoted
>
> into updates or the base branched
> > repo. Sometimes this delay is quite long during freezes.
>
> And this exact point does not apply yet and nobody realized that. I 
> opened new ticket for FESCo to re-evaluate it.

That is taken a bit out of context. I was describing a problem with
the old setup.

It's simple: always do a rawhide build, then do your branched build.

kevin

[Vít Ondruch]

Dne 14.3.2013 16:17, Kevin Fenzi napsal(a):
> On Thu, 14 Mar 2013 11:05:27 +0100
> Vít Ondruch  wrote:
> > Dennis, I don't blame you, but since you refer the ticket here, I can
> > easily quote:
> > > However, this also means users using branched updates-testing get
> >
> > newer packages than rawhide,
> > > and rawhide lags behind on fixes until those updates are promoted
> >
> > into updates or the base branched
> > > repo. Sometimes this delay is quite long during freezes.
> >
> > And this exact point does not apply yet and nobody realized that. I
> > opened new ticket for FESCo to re-evaluate it.
>
> That is taken a bit out of context. I was describing a problem with
> the old setup.

I know that you were describing problem of old setup and I agree that it 
was there, but since we are not yet in point where Bodhi is used, there 
wouldn't be the problem you were describing but we have already the 
solution for non-existing problem in place.

Vít
> It's simple: always do a rawhide build, then do your branched build.
>
> kevin

[drago01]

On Thu, Mar 14, 2013 at 4:17 PM, Kevin Fenzi  wrote:
> On Thu, 14 Mar 2013 11:05:27 +0100
> Vít Ondruch  wrote:
> > Dennis, I don't blame you, but since you refer the ticket here, I can
> > easily quote:
> > > However, this also means users using branched updates-testing get
> >
> > newer packages than rawhide,
> > > and rawhide lags behind on fixes until those updates are promoted
> >
> > into updates or the base branched
> > > repo. Sometimes this delay is quite long during freezes.
> >
> > And this exact point does not apply yet and nobody realized that. I
> > opened new ticket for FESCo to re-evaluate it.
>
> That is taken a bit out of context. I was describing a problem with
> the old setup.
>
> It's simple: always do a rawhide build, then do your branched build.

Nice way of wasting people's time ..... :/

[Kevin Kofler]

drago01 wrote:
> On Thu, Mar 14, 2013 at 4:17 PM, Kevin Fenzi  wrote:
> > It's simple: always do a rawhide build, then do your branched build.
>
> Nice way of wasting people's time ..... :/

Always building in Rawhide first is a good habit people should always get 
into, plus this change solves a common problem: You never knew whether you 
could rely on inheritance for a particular package or whether a Rawhide 
build had already been made. Now you don't need to check that anymore, you 
know that you always have to build for Rawhide. Really, it makes things much 
simpler.

I, for one, never liked Rawhide inheritance and I think it's a good thing 
that it was dropped.

Kevin Kofler

[Ville Skyttä]

On 2013-03-17 20:12, Kevin Kofler wrote:
> I, for one, never liked Rawhide inheritance and I think it's a good thing 
> that it was dropped.

I, for one, used it every single time it was possible and liked how it
saved my time as the package maintainer, resources on builders, space on
mirrors, and some pointless package updates for end users on distro
upgrades (for upgrades where a mass rebuild didn't happen and there was
no other reason to inflict updates on end users either).

[Dennis Gilmore]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Thu, 14 Mar 2013 11:05:27 +0100
Vít Ondruch  wrote:
> Dne 13.3.2013 14:28, Dennis Gilmore napsal(a):
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> >
> > On Wed, 13 Mar 2013 14:03:26 +0100
> > Vít Ondruch  wrote:
> > > Dne 13.3.2013 10:09, Peter Robinson napsal(a):
> > > > On Wed, Mar 13, 2013 at 8:25 AM, Vít Ondruch 
> > > > wrote:
> > > > > Dne 12.3.2013 16:30, Dennis Gilmore napsal(a):
> > > > > > -----BEGIN PGP SIGNED MESSAGE-----
> > > > > > Hash: SHA1
> > > > > >
> > > > > > Hi All,
> > > > > >
> > > > > > F19 has been branched, please be sure to do a git pull --rebase
> > > > > > to pick up the new branch, additionally rawhide/f20 has had
> > > > > > inheritance cut off from previous releases,  so this means that
> > > > > > anything you do for f19 you also have to do in the master branch
> > > > > > and do a build there.
> > > > >
> > > > > Why was it cut off so soon actually? The reason for disabling
> > > > > inheritance was due to Bodhi updates, which might not go stable,
> > > > > if I remember correctly, but Bodhi is not in action yet I
> > > > > suppose, so the cut of was too soon IMO. Could you please
> > > > > reconsider it? Thank you.
> > > >
> > > > No, branching is the correct time to do it. Mandated tagging
> > > > through koji and inheritance are completely unrelated. At the
> > > > moment koji tags the packages straight into f19 rather than
> > > > tagging to f19-updates-candidate and having bodhi deal with the
> > > > tagging.
> > > >
> > > > Inheritance only affect whether something is built in f19 is
> > > > inherited through to rawhide. There was a discussion some time ago
> > > > about this so presumably this change was either a decision by
> > > > release engineering or FESCo.
> > >
> > > I am afraid that the discussion was more generic, i.e. "Rawhide
> > > should not inherit from branched Fedora" and since I remember the
> > > main reason for breaking inheritance was Bodhi and Bodhi is not yet
> > > in a game, it should be clarified and adjusted.
> > >
> > > Vít
> > > > Peter
> >
> > https://fedorahosted.org/fesco/ticket/1005
> > i was asked to cut it at branching time, thats exactly what I did
>
> Dennis, I don't blame you, but since you refer the ticket here, I can 
> easily quote:

I just did what FESCo asked me to do. all along people should have been
building in rawhide first.

Dennis
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v2.0.19 (GNU/Linux)
>
> iEYEARECAAYFAlFCE58ACgkQkSxm47BaWfdLNwCglts39QdZ7ZQOyaiPnBC/4uiT
> l1AAoIRIgRD5Xq70UnRCN5lBY1sZh2+K
> =7Oxp
> -----END PGP SIGNATURE-----

[Jaroslav Reznik]

----- Original Message -----
> Dne 12.3.2013 16:30, Dennis Gilmore napsal(a):
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> >
> > Hi All,
> >
> > F19 has been branched, please be sure to do a git pull --rebase to
> > pick
> > up the new branch, additionally rawhide/f20 has had inheritance cut
> > off
> > from previous releases,  so this means that anything you do for f19
> > you
> > also have to do in the master branch and do a build there.
>
> Why was it cut off so soon actually? The reason for disabling
> inheritance was due to Bodhi updates, which might not go stable, if I
> remember correctly, but Bodhi is not in action yet I suppose, so the
> cut
> of was too soon IMO. Could you please reconsider it? Thank you.

Good point at #fedora-devel right now - we are after branching, so Branch
Freeze and Bodhi should be required now. Kevin, Dennis - what's the
correct handling of Branch Freeze and when it should get in effect?

Jaroslav
> Vít
>
> devel mailing list
> [e-mail]
> https://admin.fedoraproject.org/mailman/listinfo/devel

[Dave Jones]

On Tue, Mar 12, 2013 at 10:30:01AM -0500, Dennis Gilmore wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hi All,
>
> F19 has been branched, please be sure to do a git pull --rebase to pick
> up the new branch, additionally rawhide/f20 has had inheritance cut off
> from previous releases,  so this means that anything you do for f19 you
> also have to do in the master branch and do a build there.
>
> Dennis

Having my local mirror wiped when I rsynced todays rawhide tree was unexpected.
Having to do a full rsync again is a pain.

wtf happened that caused the mirrors to be empty ?

Dave

[Chris Adams]

Once upon a time, Dave Jones  said:
> Having my local mirror wiped when I rsynced todays rawhide tree was unexpected.
> Having to do a full rsync again is a pain.
>
> wtf happened that caused the mirrors to be empty ?

Ouch.  I see that too.  IIRC this happened before (maybe last branch?).
There should be some "safety check" that no more than X% of files get
removed in a push (where X is probably small).

> From: Chris Adams 
> To: [e-mail]
> Date: 03/13/2013 11:35
> Subject: Re: f19 mass branching
> Sent by: [e-mail]
>
> Once upon a time, Dave Jones  said:
> > Having my local mirror wiped when I rsynced todays rawhide tree
>
> was unexpected.
> > Having to do a full rsync again is a pain.
> >
> > wtf happened that caused the mirrors to be empty ?
>
> Ouch.  I see that too.

Likewise here.
> There should be some "safety check" that no more than X% of files get
> removed in a push (where X is probably small).

Long ago I used a perl script (IIRC) called 'mirror' that had just such a 
safety feature and X was specifiable.  I sure wish rsync had this.

--
John Florian

[Kevin Fenzi]

On Wed, 13 Mar 2013 10:35:00 -0500
Chris Adams  wrote:
> Once upon a time, Dave Jones  said:
> > Having my local mirror wiped when I rsynced todays rawhide tree was
> > unexpected. Having to do a full rsync again is a pain.
> >
> > wtf happened that caused the mirrors to be empty ?
>
> Ouch.  I see that too.  IIRC this happened before (maybe last
> branch?). There should be some "safety check" that no more than X% of
> files get removed in a push (where X is probably small).

It's being fixed up now.

Sorry for the trouble...

http://git.fedorahosted.org/cgit/releng/tree/scripts/buildrawhide

is the script that makes rawhide. Patches welcome.

kevin

[Dave Jones]

On Wed, Mar 13, 2013 at 09:51:01AM -0600, Kevin Fenzi wrote:
> On Wed, 13 Mar 2013 10:35:00 -0500
> Chris Adams  wrote:
> > Once upon a time, Dave Jones  said:
> > > Having my local mirror wiped when I rsynced todays rawhide tree was
> > > unexpected. Having to do a full rsync again is a pain.
> > >
> > > wtf happened that caused the mirrors to be empty ?
> >
> > Ouch.  I see that too.  IIRC this happened before (maybe last
> > branch?). There should be some "safety check" that no more than X% of
> > files get removed in a push (where X is probably small).
>
> It's being fixed up now.
>
> Sorry for the trouble...
>
> http://git.fedorahosted.org/cgit/releng/tree/scripts/buildrawhide
>
> is the script that makes rawhide. Patches welcome.

Something like this (obv. untested) might at least stop wiping the whole tree
when something gets screwed up.

I guessed at the logging part, I don't know if 'failed' is valid there.

Dave

--- 1/buildrawhide~	2013-03-13 12:28:34.613042461 -0400
+++ 2/buildrawhide	2013-03-13 12:34:03.488671561 -0400
@@ -111,7 +111,7 @@ mock -r $MOCKCONFIG --uniqueext=$DATE --
 rm /mnt/koji/mash/rawhide
 ln -s /mnt/koji/mash/rawhide-$DATE/rawhide$EXPANDARCH/ /mnt/koji/mash/rawhide

-echo "Compose finisheded at `date --utc`" > /mnt/koji/mash/rawhide-$DATE/logs/finish
+echo "Compose finished at `date --utc`" > /mnt/koji/mash/rawhide-$DATE/logs/finish
 echo >> /mnt/koji/mash/rawhide-$DATE/logs/finish

# Emit a message using bodhi's cert (since we should be running as "masher").
@@ -122,6 +122,19 @@ echo "{"log": "start", "branch": \
     --json-input

cd /tmp
+
+# Check that we actually have RPMs to write out.
+COUNT=$(find . -name "*.rpm" | wc -l)
+if [ $COUNT-eq 0 ] ; then
+  echo "No rpms generated. Something went horribly wrong\n" >> /mnt/koji/mash/rawhide-$DATE/logs/finish
+  echo "{"log": "failed", "branch": "rawhide", "arch": "$ARCH"}" | fedmsg-logger \
+    --cert-prefix bodhi \
+    --modname compose \
+    --topic rawhide.rsync.complete \
+    --json-input
+  exit
+fi
+
 # data
 $RSYNCPREFIX /usr/bin/rsync $RSYNC_OPTS --exclude repodata/ /mnt/koji/mash/rawhide-$DATE/rawhide$EXPANDARCH/ $DESTPATH
 # repodata & cleanup