Difference between revisions of "BaBar: Checking the UK-SPGrid Tools into the SLAC CVS Repository"
Chris brew (Talk | contribs) |
(No difference)
|
Latest revision as of 12:56, 27 April 2006
Note this has to be done as you not as babarmc!
First get yourself SLAC and RAL tokens
klog babarmc kslac brew
Then make a copy of the current ProdTools
directory in case anything goes wrong.
cd $BFROOT/prod cp ProdTools ProdTools-2006-04-27
First bring the repository into line with the RAL version:
cd ProdTools [lcgui0357] /afs/rl.ac.uk/bfactory/prod/ProdTools > cvs update -Ad cvs update: Updating . U History U TABLES.SQL U spUtils.pl U sparchive U spbuild ... cvs update: Updating site/uk-spgrid RCS file: /afs/rl.ac.uk/bfactory/repo/ProdTools/site/uk-spgrid/GridSiteDefs.conf,v retrieving revision 1.9 retrieving revision 1.10 Merging differences between 1.9 and 1.10 into GridSiteDefs.conf rcsmerge: warning: conflicts during merge cvs update: conflicts found in site/uk-spgrid/GridSiteDefs.conf C site/uk-spgrid/GridSiteDefs.conf RCS file: /afs/rl.ac.uk/bfactory/repo/ProdTools/site/uk-spgrid/Moose.bash,v retrieving revision 1.6 retrieving revision 1.7 Merging differences between 1.6 and 1.7 into Moose.bash rcsmerge: warning: conflicts during merge cvs update: conflicts found in site/uk-spgrid/Moose.bash C site/uk-spgrid/Moose.bash M site/uk-spgrid/babar-job-submit-wrapper RCS file: /afs/rl.ac.uk/bfactory/repo/ProdTools/site/uk-spgrid/babar_ui.conf,v retrieving revision 1.3 retrieving revision 1.4 Merging differences between 1.3 and 1.4 into babar_ui.conf rcsmerge: warning: conflicts during merge cvs update: conflicts found in site/uk-spgrid/babar_ui.conf C site/uk-spgrid/babar_ui.conf M site/uk-spgrid/babar_var.conf RCS file: /afs/rl.ac.uk/bfactory/repo/ProdTools/site/uk-spgrid/batchUtils.pl,v retrieving revision 1.9 retrieving revision 1.10 Merging differences between 1.9 and 1.10 into batchUtils.pl rcsmerge: warning: conflicts during merge cvs update: conflicts found in site/uk-spgrid/batchUtils.pl C site/uk-spgrid/batchUtils.pl RCS file: /afs/rl.ac.uk/bfactory/repo/ProdTools/site/uk-spgrid/grid-submit,v retrieving revision 1.7 retrieving revision 1.8 Merging differences between 1.7 and 1.8 into grid-submit rcsmerge: warning: conflicts during merge cvs update: conflicts found in site/uk-spgrid/grid-submit C site/uk-spgrid/grid-submit M site/uk-spgrid/initSite.pl RCS file: /afs/rl.ac.uk/bfactory/repo/ProdTools/site/uk-spgrid/local-grid-setup,v retrieving revision 1.5 retrieving revision 1.6 Merging differences between 1.5 and 1.6 into local-grid-setup rcsmerge: warning: conflicts during merge cvs update: conflicts found in site/uk-spgrid/local-grid-setup C site/uk-spgrid/local-grid-setup M site/uk-spgrid/process-accounting.pl M site/uk-spgrid/recover-data.sh M site/uk-spgrid/reporter RCS file: /afs/rl.ac.uk/bfactory/repo/ProdTools/site/uk-spgrid/spbuild-grid,v retrieving revision 1.2 retrieving revision 1.3 Merging differences between 1.2 and 1.3 into spbuild-grid rcsmerge: warning: conflicts during merge cvs update: conflicts found in site/uk-spgrid/spbuild-grid C site/uk-spgrid/spbuild-grid M site/uk-spgrid/sprite_rc M site/uk-spgrid/spunpack M site/uk-spgrid/spunpacker ? site/uk-spgrid/History ? site/uk-spgrid/spgrid-job-monitor ? site/uk-spgrid/spgridjobs-new cvs update: Updating site/uofl .. cvs update: Updating site/vandy
Now deal with any conflicts and/or files that need to be added
cd /afs/rl.ac.uk/bfactory/prod/ProdTools-2006-04-27/site/uk-spgrid cp --target-directory /afs/rl.ac.uk/bfactory/prod/ProdTools/site/uk-spgrid GridSiteDefs.conf \ Moose.bash babar_ui.conf batchUtils.pl grid-submit local-grid-setup spbuild-grid cd - bcvs add spgrid-job-monitor bcvs add History
Next update against the SLAC repository
bcvs update -A update -A switching repository to /afs/slac.stanford.edu/g/babar/repo for module fixcvs version 1.3 converting folder based on $CVSROOT [/afs/slac.stanford.edu/g/babar/repo] [f-52] .: [f-46] ... ./doc/man: [f-46] cvs update -A cvs update: Updating . ? spexport-old ? spmerge-short cvs update: Updating HTTP cvs update: Updating Proc cvs update: Updating cgi cvs update: Updating doc U doc/userguide.tex cvs update: Updating doc/man cvs update: Updating java cvs update: Updating site ? site/brew ? site/castelli ? site/ral cvs update: Updating site/bristol ... cvs update: Updating site/uk cvs update: Updating site/uk-spgrid M site/uk-spgrid/GridSiteDefs.conf A site/uk-spgrid/History M site/uk-spgrid/Moose.bash M site/uk-spgrid/babar-job-submit-wrapper M site/uk-spgrid/babar_ui.conf M site/uk-spgrid/babar_var.conf M site/uk-spgrid/batchUtils.pl M site/uk-spgrid/grid-submit M site/uk-spgrid/initSite.pl M site/uk-spgrid/local-grid-setup M site/uk-spgrid/process-accounting.pl M site/uk-spgrid/recover-data.sh M site/uk-spgrid/reporter M site/uk-spgrid/spbuild-grid A site/uk-spgrid/spgrid-job-monitor M site/uk-spgrid/sprite_rc M site/uk-spgrid/spunpack M site/uk-spgrid/spunpacker ? site/uk-spgrid/spgridjobs-new ... cvs update: Updating site/vandy switching repository back to /afs/rl.ac.uk/bfactory/repo for module fixcvs version 1.3 converting folder based on $CVSROOT [/afs/rl.ac.uk/bfactory/repo] [f-52] .: [f-46] ... ./doc/man: [f-46]
Then check the code in writing some useful comments when prompted.
bcvs ci ci switching repository to /afs/slac.stanford.edu/g/babar/repo for module fixcvs version 1.3 converting folder based on $CVSROOT [/afs/slac.stanford.edu/g/babar/repo] [f-52] .: [f-46] ./HTTP: [f-46] ./Proc: [f-46] ... Checking in site/uk-spgrid/GridSiteDefs.conf; /afs/slac.stanford.edu/g/babar/repo/ProdTools/site/uk-spgrid/GridSiteDefs.conf,v <-- GridSiteDefs.conf new revision: 1.11; previous revision: 1.10 done RCS file: /afs/slac.stanford.edu/g/babar/repo/ProdTools/site/uk-spgrid/History,v done Checking in site/uk-spgrid/History; /afs/slac.stanford.edu/g/babar/repo/ProdTools/site/uk-spgrid/History,v <-- History initial revision: 1.1 done Checking in site/uk-spgrid/Moose.bash; /afs/slac.stanford.edu/g/babar/repo/ProdTools/site/uk-spgrid/Moose.bash,v <-- Moose.bash new revision: 1.8; previous revision: 1.7 done Checking in site/uk-spgrid/babar-job-submit-wrapper; /afs/slac.stanford.edu/g/babar/repo/ProdTools/site/uk-spgrid/babar-job-submit-wrapper,v <-- babar-job-submit-wrapper new revision: 1.2; previous revision: 1.1 done Checking in site/uk-spgrid/babar_ui.conf; /afs/slac.stanford.edu/g/babar/repo/ProdTools/site/uk-spgrid/babar_ui.conf,v <-- babar_ui.conf new revision: 1.5; previous revision: 1.4 done Checking in site/uk-spgrid/babar_var.conf; /afs/slac.stanford.edu/g/babar/repo/ProdTools/site/uk-spgrid/babar_var.conf,v <-- babar_var.conf new revision: 1.4; previous revision: 1.3 done Checking in site/uk-spgrid/batchUtils.pl; /afs/slac.stanford.edu/g/babar/repo/ProdTools/site/uk-spgrid/batchUtils.pl,v <-- batchUtils.pl new revision: 1.11; previous revision: 1.10 done Checking in site/uk-spgrid/grid-submit; /afs/slac.stanford.edu/g/babar/repo/ProdTools/site/uk-spgrid/grid-submit,v <-- grid-submit new revision: 1.9; previous revision: 1.8 done Checking in site/uk-spgrid/initSite.pl; /afs/slac.stanford.edu/g/babar/repo/ProdTools/site/uk-spgrid/initSite.pl,v <-- initSite.pl new revision: 1.9; previous revision: 1.8 done Checking in site/uk-spgrid/local-grid-setup; /afs/slac.stanford.edu/g/babar/repo/ProdTools/site/uk-spgrid/local-grid-setup,v <-- local-grid-setup new revision: 1.7; previous revision: 1.6 done Checking in site/uk-spgrid/process-accounting.pl; /afs/slac.stanford.edu/g/babar/repo/ProdTools/site/uk-spgrid/process-accounting.pl,v <-- process-accounting.pl new revision: 1.2; previous revision: 1.1 done Checking in site/uk-spgrid/recover-data.sh; /afs/slac.stanford.edu/g/babar/repo/ProdTools/site/uk-spgrid/recover-data.sh,v <-- recover-data.sh new revision: 1.3; previous revision: 1.2 done Checking in site/uk-spgrid/reporter; /afs/slac.stanford.edu/g/babar/repo/ProdTools/site/uk-spgrid/reporter,v <-- reporter new revision: 1.3; previous revision: 1.2 done Checking in site/uk-spgrid/spbuild-grid; /afs/slac.stanford.edu/g/babar/repo/ProdTools/site/uk-spgrid/spbuild-grid,v <-- spbuild-grid new revision: 1.4; previous revision: 1.3 done RCS file: /afs/slac.stanford.edu/g/babar/repo/ProdTools/site/uk-spgrid/spgrid-job-monitor,v done Checking in site/uk-spgrid/spgrid-job-monitor; /afs/slac.stanford.edu/g/babar/repo/ProdTools/site/uk-spgrid/spgrid-job-monitor,v <-- spgrid-job-monitor initial revision: 1.1 done Checking in site/uk-spgrid/sprite_rc; /afs/slac.stanford.edu/g/babar/repo/ProdTools/site/uk-spgrid/sprite_rc,v <-- sprite_rc new revision: 1.2; previous revision: 1.1 done Checking in site/uk-spgrid/spunpack; /afs/slac.stanford.edu/g/babar/repo/ProdTools/site/uk-spgrid/spunpack,v <-- spunpack new revision: 1.8; previous revision: 1.7 done Checking in site/uk-spgrid/spunpacker; /afs/slac.stanford.edu/g/babar/repo/ProdTools/site/uk-spgrid/spunpacker,v <-- spunpacker new revision: 1.7; previous revision: 1.6 done chmod g+ws /afs/slac.stanford.edu/g/babar/repo/ProdTools/site/uk-spgrid send mail to experts: pck@slac.stanford.edu cochran@slac.stanford.edu hufnagel@slac.stanford.edu fblanc@slac.stanford.edu bfmail@slac.stanford.edu douglas@slac.stanford.edu switching repository back to /afs/rl.ac.uk/bfactory/repo for module fixcvs version 1.3 converting folder based on $CVSROOT [/afs/rl.ac.uk/bfactory/repo] [f-52] .: [f-46] ...
Finally tag the version
bcvs tag cajb20060427
The changes to the uk-spgrid tools are now checked in but you ProdTools version is now at the CVS head which is probably not what you want so now revert ProdTools back to the current version.
cvs update -A -r V00-06-09
but now the uk-spgrid tools have reverted back and you need to check the latest version of them out (from SLAC, it will not have been replicated to RAL yet):
cd site/uk-spgrid bcvs update -A -r cajb20060427
Chris brew 13:56, 27 Apr 2006 (BST)