411235 - pull patcher and build-tools from the same tag

Status: RESOLVED FIXED

(Release Engineering :: General, defect, P2)

Description

[Robert Helmer [:rhelmer]]

We should be pulling patcher from a tag (not trunk). We tell patcher to pull the update-packaging tools from a tag (currently a gecko release tag), but we could make a special tag that covers both of these.

First, we need update-packaging tools to not be broken on trunk (bug 375415). This then clears the way to safely land some monumental performance improvements (bug 391958).

Comment 1

[Robert Helmer [:rhelmer]]

Attachment: pull patcher from patcherToolsRev tag

For simplicity's sake, why not use patcherToolsRev for patcher and the build tools?

Followup to this should be to tag the tree with something patcher-specific (or pick a release tag that happens to have everything we want), and bump all of the bootstrap configs.

Comment 2

[Nick Thomas [:nthomas] (UTC+12)]

Comment on attachment 296539 [details] [diff] [review]
pull patcher from patcherToolsRev tag

That seems fine. Just reading thru the rest of this file, there are other candidates for coming off a tag, eg
* MozBuild off the release automation tag, although it's a bit recursive. Maybe cvs stat on itself to look it up ? ;-)
* the patcher config off the release tag

Comment 3

[Robert Helmer [:rhelmer]]

(In reply to comment #2)
> (From update of attachment 296539 [details] [diff] [review])
> That seems fine. Just reading thru the rest of this file, there are other
> candidates for coming off a tag, eg
> * MozBuild off the release automation tag, although it's a bit recursive. Maybe
> cvs stat on itself to look it up ? ;-)

Ugh :P yeah forgot about this one, that needs to be done inside patcher I guess.. maybe we should do patcherToolsRev for that as well?

> * the patcher config off the release tag

Hmm actually I don't think this will work as-is because PatcherConfig.pm seems to just bump and then check in the config, it does not apply a tag.. maybe because it used to be in the private repo? We should probably make it force-tag the release tag.

Comment 4

[John O'Duinn [:joduinn] (please use "needinfo?" flag)]

Should I close bug#408854 as s dup?

Comment 5

[Robert Helmer [:rhelmer]]

(In reply to comment #4)
> Should I close bug#408854 as s dup?

Yeah I guess so, all the discussion is in here already. Sorry I didn't see that one first.

Comment 7

[John O'Duinn [:joduinn] (please use "needinfo?" flag)]

(In reply to comment #5)
> (In reply to comment #4)
> > Should I close bug#408854 as s dup?
> Yeah I guess so, all the discussion is in here already. 
Done. 

> Sorry I didn't see that
> one first.
No worries.

Comment 8

[Robert Helmer [:rhelmer]]

(In reply to comment #3)
> (In reply to comment #2)
> > (From update of attachment 296539 [details] [diff] [review] [details])
> > That seems fine. Just reading thru the rest of this file, there are other
> > candidates for coming off a tag, eg
> > * MozBuild off the release automation tag, although it's a bit recursive. Maybe
> > cvs stat on itself to look it up ? ;-)
> 
> Ugh :P yeah forgot about this one, that needs to be done inside patcher I
> guess.. maybe we should do patcherToolsRev for that as well?

oh, wrong, this is done by bootstrap. I'll work up a patch, I think we should just use patcherToolsRev for everything update-related.

Comment 9

[Robert Helmer [:rhelmer]]

Attachment: [checked in] pull MozBuild for patcher from patcherToolsRev

Comment 10

[Robert Helmer [:rhelmer]]

I created a common tag, UPDATE_PACKAGING_R1, that we can use as the patcherToolsRev setting:

cvs co -r MOZILLA_1_9a2_RELEASE mozilla/client.mk
cd mozilla
make -f client.mk MOZ_CO_PROJECT=all checkout
cvs up -A tools/update-packaging
cvs up -AdP tools/release
cvs up -AdP tools/patcher
cvs -q tag UPDATE_PACKAGING_R1 2>&1 | tee ../tag.log
grep -v '^T' ../tag.log
cvs tag -b UPDATE_PACKAGING_R1_minibranch client.mk

Also, bumped client.mk to pull UPDATE_PACKAGING_R1, using a minibranch and referenced this bug in checkin comment, then force-tagged this version to UPDATE_PACKAGING_R1:

Checking in client.mk;
/cvsroot/mozilla/client.mk,v  <--  client.mk
new revision: 1.314.2.1.2.1; previous revision: 1.314.2.1
done

cvs up -r UPDATE_PACKAGING_R1_minibranch client.mk 
cvs -q tag UPDATE_PACKAGING_R1 client.mk
# expected response W client.mk : UPDATE_PACKAGING_R1 already exists on version 1.314.2.1 : NOT MOVING tag to version 1.314.2.1.2.1
cvs -q tag -F UPDATE_PACKAGING_R1 client.mk 
# expected response T client.mk

Comment 11

[Robert Helmer [:rhelmer]]

Comment on attachment 297214 [details] [diff] [review]
[checked in] pull MozBuild for patcher from patcherToolsRev

Checking in Bootstrap/Step/Updates.pm;
/cvsroot/mozilla/tools/release/Bootstrap/Step/Updates.pm,v  <--  Updates.pm
new revision: 1.34; previous revision: 1.33
done

Comment 12

[Robert Helmer [:rhelmer]]

Attachment: [checked in] pull update tools from UPDATE_PACKAGING_R1 tag

Comment 13

[Robert Helmer [:rhelmer]]

Comment on attachment 297238 [details] [diff] [review]
[checked in] pull update tools from UPDATE_PACKAGING_R1 tag

Checking in fx-moz18-bootstrap.cfg;
/cvsroot/mozilla/tools/release/configs/fx-moz18-bootstrap.cfg,v  <--  fx-moz18-bootstrap.cfg
new revision: 1.27; previous revision: 1.26
done
Checking in fx-moz18-nightly-bootstrap.cfg;
/cvsroot/mozilla/tools/release/configs/fx-moz18-nightly-bootstrap.cfg,v  <--  fx-moz18-nightly-bootstrap.cfg
new revision: 1.2; previous revision: 1.1
done
Checking in fx-moz18-staging-bootstrap.cfg;
/cvsroot/mozilla/tools/release/configs/fx-moz18-staging-bootstrap.cfg,v  <--  fx-moz18-staging-bootstrap.cfg
new revision: 1.12; previous revision: 1.11
done
Checking in fx-moz180-bootstrap.cfg;
/cvsroot/mozilla/tools/release/configs/fx-moz180-bootstrap.cfg,v  <--  fx-moz180-bootstrap.cfg
new revision: 1.8; previous revision: 1.7
done
Checking in fx-moz19-bootstrap.cfg;
/cvsroot/mozilla/tools/release/configs/fx-moz19-bootstrap.cfg,v  <--  fx-moz19-bootstrap.cfg
new revision: 1.7; previous revision: 1.6
done
Checking in fx-moz19-nightly-bootstrap.cfg;
/cvsroot/mozilla/tools/release/configs/fx-moz19-nightly-bootstrap.cfg,v  <--  fx-moz19-nightly-bootstrap.cfg
new revision: 1.3; previous revision: 1.2
done
Checking in fx-moz19-staging-bootstrap.cfg;
/cvsroot/mozilla/tools/release/configs/fx-moz19-staging-bootstrap.cfg,v  <--  fx-moz19-staging-bootstrap.cfg
new revision: 1.7; previous revision: 1.6
done
Checking in tb-moz18-bootstrap.cfg;
/cvsroot/mozilla/tools/release/configs/tb-moz18-bootstrap.cfg,v  <--  tb-moz18-bootstrap.cfg
new revision: 1.14; previous revision: 1.13
done
Checking in tb-moz180-bootstrap.cfg;
/cvsroot/mozilla/tools/release/configs/tb-moz180-bootstrap.cfg,v  <--  tb-moz180-bootstrap.cfg
new revision: 1.10; previous revision: 1.9
done