Project

General

Profile

How to tag and build a LArSoft patch release » History » Version 13

Lynn Garren, 03/04/2019 04:22 PM

1 1 Lynn Garren
h1. How to tag and build a LArSoft patch release
2 1 Lynn Garren
3 3 Lynn Garren
{{>TOC}}
4 3 Lynn Garren
5 10 Lynn Garren
[[Policy for development from a tagged release]]
6 1 Lynn Garren
Experiments will build patch releases themselves with help from the LArSoft release manager.
7 2 Lynn Garren
There will be a very limited set of people with privileges to do this.  
8 7 Lynn Garren
We ask that the experiment release managers to whom these privileges have been granted do not grant privileges to anyone else.  Instead request permissions from LArSoft.
9 6 Lynn Garren
Permissions will be removed when someone ceases to have this responsibility.
10 2 Lynn Garren
11 10 Lynn Garren
* Permissions include:
12 10 Lynn Garren
** larsoft redmine manager role
13 10 Lynn Garren
** ability to login to larsoft cvmfs
14 10 Lynn Garren
** ability to upload to SciSoft with the larsoft role
15 12 Lynn Garren
** developer status for larreltools
16 10 Lynn Garren
17 13 Lynn Garren
[[LArSoft responsiblities for patch releases]]
18 13 Lynn Garren
19 11 Lynn Garren
h2(count). Request a release
20 11 Lynn Garren
21 11 Lynn Garren
* Before starting any patch release, fill out a redmine issue requesting the release with all pertinent information.
22 10 Lynn Garren
23 10 Lynn Garren
24 2 Lynn Garren
h2(count). Tools
25 2 Lynn Garren
26 2 Lynn Garren
* Scripts used to build the patch release will be found in the larreltools product.  
27 2 Lynn Garren
* larreltools is not part of the standard distribution, but will be available from SciSoft and in cvmfs.
28 4 Lynn Garren
29 2 Lynn Garren
h2(count). Initial setup
30 1 Lynn Garren
31 10 Lynn Garren
*This step is done once for any patch release step and will be done by the LArSoft release manager.*
32 9 Lynn Garren
33 2 Lynn Garren
h3(count). Make branches for the release
34 13 Lynn Garren
35 13 Lynn Garren
This step will be done by the LArSoft release manager.
36 2 Lynn Garren
37 2 Lynn Garren
* If a release is named vaa_bb_cc, branches will be created for the larsoft/larsoftobj suite with the name vaa_bb_cc_br.
38 2 Lynn Garren
<pre>
39 2 Lynn Garren
(setup the latest larreltools)
40 2 Lynn Garren
setup mrb
41 2 Lynn Garren
export MRB_PROJECT=larsoft
42 2 Lynn Garren
mrb newDev -v  vaa_bb_cc -q eN:prof 
43 2 Lynn Garren
source local*/setup
44 2 Lynn Garren
cd $MRB_SOURCE
45 2 Lynn Garren
mrb g -t LARSOFT_SUITE_vAA_BB_CC larsoft_suite
46 2 Lynn Garren
mrb g -t LARSOFT_SUITE_vAA_BB_CC larsoftobj_suite
47 2 Lynn Garren
dogit branch (check that you are on the head of the tag)
48 2 Lynn Garren
dogit "co -b vaa_bb_cc_br"
49 2 Lynn Garren
dogit "push -u origin vaa_bb_cc_br"
50 1 Lynn Garren
</pre>
51 8 Lynn Garren
** Note that some older patch releases may have used a slightly different branch naming scheme.
52 2 Lynn Garren
53 4 Lynn Garren
h3(count). Housecleaning
54 2 Lynn Garren
55 2 Lynn Garren
* cd $MRB_SOURCE/larsoft/releaseDB
56 2 Lynn Garren
* Make sure that larutils, larbatch, and mrb are removed from the cfg scripts.
57 2 Lynn Garren
** streamline this by creating a small "larsoft extras" distribution that can be optionally included.
58 2 Lynn Garren
* commit and push the change
59 2 Lynn Garren
60 4 Lynn Garren
h2(count). Making a patch release
61 2 Lynn Garren
62 2 Lynn Garren
* These notes presume that you do not have an existing directory
63 2 Lynn Garren
64 4 Lynn Garren
h3(count). MicroBooNE setup
65 2 Lynn Garren
66 2 Lynn Garren
* setup the latest release of larreltools
67 2 Lynn Garren
* startUboonePatchRel  <working_dir> <tag> <larsoft branch> [<uboone branch>]
68 2 Lynn Garren
** This script will create a directory named "tag" under the "working_dir".
69 2 Lynn Garren
** This script will clone the larsoft/larsoftobj on the named branch.
70 2 Lynn Garren
** The same branch name will be used when cloning the uboone_suite unless a second branch name is supplied.
71 2 Lynn Garren
** The directory structure will include a single source code directory with subdirectories for e17 and c2 debug and prof builds.
72 2 Lynn Garren
** Use "dogit branch" to double check that you are on the expected branch.
73 2 Lynn Garren
74 4 Lynn Garren
h3(count). Setup for other experiments
75 2 Lynn Garren
76 2 Lynn Garren
* Appropriate scripts will be supplied when necessary.
77 2 Lynn Garren
78 4 Lynn Garren
h3(count). Local development
79 2 Lynn Garren
80 2 Lynn Garren
* Before integrating any feature branches, make sure that the release builds as is and that the unit tests work.
81 2 Lynn Garren
** Make sure to build and test both e17 and c2.   Usually the prof build is sufficient for testing.  prof is preferred over debug, which sometimes masks problems.
82 2 Lynn Garren
<pre>
83 2 Lynn Garren
source local*/setup
84 2 Lynn Garren
cd $MRB_BUILDDIR
85 2 Lynn Garren
mrb t -jN
86 2 Lynn Garren
</pre>
87 2 Lynn Garren
* Next make changes and integrate feature branches
88 2 Lynn Garren
** Because feature branches may conflict or not have been thoroughly tested, we recommend merging one feature branch set at a time.  Build and test after each set.
89 2 Lynn Garren
90 4 Lynn Garren
h3(count). Update the package versions
91 2 Lynn Garren
92 2 Lynn Garren
* Do this once all changes have been made.
93 2 Lynn Garren
* ONLY update the version if there is a change.
94 2 Lynn Garren
* cd to each directory separately
95 2 Lynn Garren
* git diff LARSOFT_SUITE_vaa_bb_cc[_dd]
96 2 Lynn Garren
** You are comparing against the previous patch release in this set.
97 2 Lynn Garren
** If this is the first patch release in the set, compare against the original release.
98 2 Lynn Garren
** If there are no changes, move this package out of the way.
99 2 Lynn Garren
<pre>
100 2 Lynn Garren
cd $MRB_SOURCE
101 2 Lynn Garren
mkdir ../notag
102 2 Lynn Garren
mv xxx ../notag
103 2 Lynn Garren
mrb uc
104 2 Lynn Garren
</pre>
105 2 Lynn Garren
** Move all experiment code out of the way.  (_mv ub* ../notag/_ for MicroBooNE)
106 2 Lynn Garren
** Use "mrb uv" to update the version by one in the patch field.
107 2 Lynn Garren
*** There should be a script for this...
108 2 Lynn Garren
* You must update larsoftobj/bundle/CMakeLists.txt and larsoft/releaseDB/CMakeLists.txt by hand with the new versions.
109 2 Lynn Garren
** commit and push these changes
110 2 Lynn Garren
* DO NOT commit the changes to ups/product_deps
111 2 Lynn Garren
112 2 Lynn Garren
113 4 Lynn Garren
h3(count).  Tagging the release
114 2 Lynn Garren
115 2 Lynn Garren
* Do a final build and test with just the packages you expect to tag.  
116 2 Lynn Garren
** This step will also create the necessary build cfg files.
117 2 Lynn Garren
** If there are changes in both larsoft and larsoftobj, double check for consistency.
118 2 Lynn Garren
<pre>
119 2 Lynn Garren
cd $MRB_BUILDDIR/larsoft
120 2 Lynn Garren
diff releaseDB ../larsoftobj/bundle | grep diff
121 2 Lynn Garren
diff releaseDB ../larsoftobj/bundle | grep Only
122 2 Lynn Garren
</pre>
123 2 Lynn Garren
** If all is good, copy the cfg scripts to SciSoft
124 2 Lynn Garren
<pre>
125 2 Lynn Garren
cd $MRB_BUILDDIR/larsoft/releaseDB
126 2 Lynn Garren
copyToSciSoft lar*
127 2 Lynn Garren
</pre>
128 2 Lynn Garren
* Now tag
129 2 Lynn Garren
** tagPatchRel <existing branch> <new master tag>
130 2 Lynn Garren
** tagPatchRel will commit ups/product_deps with an appropriate message, make the tag, and push both tag and branch to origin.
131 2 Lynn Garren
** Use "dogit status" to doublecheck.
132 2 Lynn Garren
** *IMPORTANT*:  patch release tags are never merged with the master branch
133 2 Lynn Garren
134 4 Lynn Garren
h3(count).  Official build
135 2 Lynn Garren
136 2 Lynn Garren
* build on Jenkins
137 2 Lynn Garren
* Use special patch release build jobs.
138 2 Lynn Garren
** This avoids possible conflict with normal release builds.
139 1 Lynn Garren
* use copyFromJenkins to download the tarballs and release manifests from Jenkins
140 1 Lynn Garren
* use copyToSciSoft to upload the tarballs and release manifests to SciSoft
141 1 Lynn Garren
** This step requires extra privileges.
142 5 Lynn Garren
143 5 Lynn Garren
h3(count).  Release Notes and Cross Package Tag
144 5 Lynn Garren
145 2 Lynn Garren
* Once the build is complete for ALL variants (SLF and macOS), make the cross package tag.
146 5 Lynn Garren
** We wait because sometimes a problem is not found until building and we need to move a tag.
147 2 Lynn Garren
** This step requires redmine manager persmission for larsoft
148 2 Lynn Garren
<pre>
149 2 Lynn Garren
cp-lar-tag <larsoft tag> <larsoftobj tag>
150 2 Lynn Garren
</pre>
151 2 Lynn Garren
*** It would be nice to fix cp-lar-tag so it deduces the larsoftobj tag
152 2 Lynn Garren
* Make the release notes
153 2 Lynn Garren
** make-release-notes <working_directory> <tag> <previous tag>
154 2 Lynn Garren
*** This script will create a subdirectory named tag under the working_directory
155 2 Lynn Garren
** cd into the newly created tag directory
156 2 Lynn Garren
** cat ReleaseNotes-vaa_bb_cc_dd
157 2 Lynn Garren
*** The first line of this output is the entry in the [[LArSoft_release_list|release list]]
158 2 Lynn Garren
*** The remainder of the output is used to create the release note itself.
159 1 Lynn Garren
**** copy and edit the top part if appropriate.
160 1 Lynn Garren
**** Do not edit anything under the "Change List" section.
161 1 Lynn Garren
**** It is important to use cat so that there are no unexpected line breaks.
162 5 Lynn Garren
163 5 Lynn Garren
h3(count). Upload to cvmfs
164 5 Lynn Garren
165 5 Lynn Garren
* This step requires login privileges.
166 5 Lynn Garren
* ssh cvmfslarsoft@oasiscfs.fnal.gov
167 5 Lynn Garren
* The README provides an overview of the necessary steps.
168 5 Lynn Garren
** start a transaction
169 5 Lynn Garren
** install using installBundle.sh
170 5 Lynn Garren
** publish
171 5 Lynn Garren
* installBundle.sh larsoft vaa_bb_cc_zz sNN-eY
172 5 Lynn Garren
** Note that if you call installBundle.sh with sNN-e17, it will install both e17 and c2 variants.
173 5 Lynn Garren
** The script will attempt to install the release for all supported platforms and clean up after itself.
174 5 Lynn Garren
** If some expected distributions are not available, then manifests will be left in the .working subdirectory. Check and remove them if necessary.