Project

General

Profile

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

Lynn Garren, 07/01/2019 01:59 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 22 Lynn Garren
** abiltiy to run Jenkins jobs
17 10 Lynn Garren
18 13 Lynn Garren
[[LArSoft responsiblities for patch releases]]
19 13 Lynn Garren
20 11 Lynn Garren
h2(count). Request a release
21 11 Lynn Garren
22 11 Lynn Garren
* Before starting any patch release, fill out a redmine issue requesting the release with all pertinent information.
23 10 Lynn Garren
24 10 Lynn Garren
25 2 Lynn Garren
h2(count). Tools
26 2 Lynn Garren
27 2 Lynn Garren
* Scripts used to build the patch release will be found in the larreltools product.  
28 19 Lynn Garren
* *larreltools* is not part of the standard distribution, but will be available from SciSoft and in cvmfs.
29 16 Lynn Garren
** Always use the latest release, which will be declared current.
30 20 Lynn Garren
** More [[larreltools:|information]]
31 4 Lynn Garren
32 2 Lynn Garren
h2(count). Initial setup
33 1 Lynn Garren
34 15 Lynn Garren
*This step is done once for any patch release set and will be done by the LArSoft release manager.*
35 9 Lynn Garren
36 4 Lynn Garren
h2(count). Making a patch release
37 2 Lynn Garren
38 2 Lynn Garren
* These notes presume that you do not have an existing directory
39 2 Lynn Garren
40 24 Lynn Garren
h3(count). Setup the working area
41 2 Lynn Garren
42 1 Lynn Garren
* setup the latest release of larreltools
43 24 Lynn Garren
* startPatchRel <working_dir> <experiment> <new patch tag> <larsoft branch> [<experiment branch>]
44 24 Lynn Garren
** Recognized experiment names are argoneut, dune, lariat, icarus, sbnd, and uboone.
45 2 Lynn Garren
** This script will create a directory named "tag" under the "working_dir".
46 24 Lynn Garren
** This script will clone the larsoft and larsoftobj suites using the named branch.
47 24 Lynn Garren
** The same branch name will be used when cloning the experiment code unless a second branch name is supplied.
48 2 Lynn Garren
** The directory structure will include a single source code directory with subdirectories for e17 and c2 debug and prof builds.
49 24 Lynn Garren
** Use "dogit branch" to double check that you are on the expected branch of all packages.
50 2 Lynn Garren
51 4 Lynn Garren
h3(count). Local development
52 2 Lynn Garren
53 2 Lynn Garren
* Before integrating any feature branches, make sure that the release builds as is and that the unit tests work.
54 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.
55 2 Lynn Garren
<pre>
56 2 Lynn Garren
source local*/setup
57 2 Lynn Garren
cd $MRB_BUILDDIR
58 2 Lynn Garren
mrb t -jN
59 2 Lynn Garren
</pre>
60 2 Lynn Garren
* Next make changes and integrate feature branches
61 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.
62 2 Lynn Garren
63 4 Lynn Garren
h3(count). Update the package versions
64 2 Lynn Garren
65 2 Lynn Garren
* Do this once all changes have been made.
66 25 Lynn Garren
67 25 Lynn Garren
* Use the *updatePatchVersion* script from larreltools.
68 25 Lynn Garren
** This script takes no arguments.
69 25 Lynn Garren
** This script will call "mrb uv" to update each patch release by one.
70 25 Lynn Garren
** If there was no previous patch release, the version will be vaa_bb_cc_01
71 25 Lynn Garren
72 2 Lynn Garren
* ONLY update the version if there is a change.
73 2 Lynn Garren
* cd to each directory separately
74 2 Lynn Garren
* git diff LARSOFT_SUITE_vaa_bb_cc[_dd]
75 2 Lynn Garren
** You are comparing against the previous patch release in this set.
76 1 Lynn Garren
** If this is the first patch release in the set, compare against the original release.
77 25 Lynn Garren
** Sometimes the only change is an updated dependency.
78 25 Lynn Garren
** If there are no changes, use mrb uv to restore the previous release version and then move this package out of the way.
79 1 Lynn Garren
<pre>
80 1 Lynn Garren
cd $MRB_SOURCE
81 1 Lynn Garren
mkdir ../notag
82 16 Lynn Garren
mv xxx ../notag
83 17 Lynn Garren
mrb uc
84 16 Lynn Garren
</pre>
85 16 Lynn Garren
** Move all experiment code out of the way.  (_mv ub* ../notag/_ for MicroBooNE)
86 1 Lynn Garren
87 26 Lynn Garren
* As of mrb v3_02_01, the "mrb uv" command will update larsoftobj/bundle/CMakeLists.txt, larsoft/releaseDB/CMakeLists, and <my experiment>/releaseDB/CMakeLists.txt as well as ups/product_deps.
88 25 Lynn Garren
** commit changes in the releaseDB or bundle subdirectoies, but do not commit changes in ups/product_deps.
89 25 Lynn Garren
* DO NOT commit the changes to ups/product_deps.  tagPatchRel will commit ups/product_deps.
90 2 Lynn Garren
91 2 Lynn Garren
92 4 Lynn Garren
h3(count).  Tagging the release
93 2 Lynn Garren
94 2 Lynn Garren
* Do a final build and test with just the packages you expect to tag.  
95 25 Lynn Garren
** This step will also create the necessary build config files.
96 2 Lynn Garren
** If there are changes in both larsoft and larsoftobj, double check for consistency.
97 2 Lynn Garren
<pre>
98 1 Lynn Garren
cd $MRB_BUILDDIR/larsoft
99 2 Lynn Garren
diff releaseDB ../larsoftobj/bundle | grep diff
100 2 Lynn Garren
diff releaseDB ../larsoftobj/bundle | grep Only
101 2 Lynn Garren
</pre>
102 2 Lynn Garren
** If all is good, copy the cfg scripts to SciSoft
103 2 Lynn Garren
<pre>
104 2 Lynn Garren
cd $MRB_BUILDDIR/larsoft/releaseDB
105 2 Lynn Garren
copyToSciSoft lar*
106 2 Lynn Garren
</pre>
107 2 Lynn Garren
* Now tag
108 25 Lynn Garren
** tagPatchRel <existing branch> <new larsoft tag>
109 2 Lynn Garren
** tagPatchRel will commit ups/product_deps with an appropriate message, make the tag, and push both tag and branch to origin.
110 2 Lynn Garren
** Use "dogit status" to doublecheck.
111 2 Lynn Garren
** *IMPORTANT*:  patch release tags are never merged with the master branch
112 2 Lynn Garren
113 4 Lynn Garren
h3(count).  Official build
114 2 Lynn Garren
115 2 Lynn Garren
* build on Jenkins
116 2 Lynn Garren
* Use special patch release build jobs.
117 2 Lynn Garren
** This avoids possible conflict with normal release builds.
118 21 Lynn Garren
** "larpatch-slf":https://buildmaster.fnal.gov/buildmaster/view/LArSoft/job/larpatch-slf/
119 21 Lynn Garren
** "larpatch-mac":https://buildmaster.fnal.gov/buildmaster/view/LArSoft/job/larpatch-mac/
120 1 Lynn Garren
* use copyFromJenkins to download the tarballs and release manifests from Jenkins
121 1 Lynn Garren
* use copyToSciSoft to upload the tarballs and release manifests to SciSoft
122 1 Lynn Garren
** This step requires extra privileges.
123 5 Lynn Garren
124 5 Lynn Garren
h3(count).  Release Notes and Cross Package Tag
125 5 Lynn Garren
126 2 Lynn Garren
* Once the build is complete for ALL variants (SLF and macOS), make the cross package tag.
127 5 Lynn Garren
** We wait because sometimes a problem is not found until building and we need to move a tag.
128 2 Lynn Garren
** This step requires redmine manager persmission for larsoft
129 2 Lynn Garren
<pre>
130 18 Lynn Garren
cp-patch-tag <larsoft tag> <larsoftobj tag>
131 2 Lynn Garren
</pre>
132 18 Lynn Garren
*** It would be nice to fix cp-patch-tag so it deduces the larsoftobj tag
133 2 Lynn Garren
* Make the release notes
134 23 Lynn Garren
** makePatchRelNotes <working_directory> <tag> <previous tag>
135 2 Lynn Garren
*** This script will create a subdirectory named tag under the working_directory
136 2 Lynn Garren
** cd into the newly created tag directory
137 2 Lynn Garren
** cat ReleaseNotes-vaa_bb_cc_dd
138 2 Lynn Garren
*** The first line of this output is the entry in the [[LArSoft_release_list|release list]]
139 2 Lynn Garren
*** The remainder of the output is used to create the release note itself.
140 1 Lynn Garren
**** copy and edit the top part if appropriate.
141 1 Lynn Garren
**** Do not edit anything under the "Change List" section.
142 1 Lynn Garren
**** It is important to use cat so that there are no unexpected line breaks.
143 5 Lynn Garren
144 5 Lynn Garren
h3(count). Upload to cvmfs
145 5 Lynn Garren
146 5 Lynn Garren
* This step requires login privileges.
147 5 Lynn Garren
* ssh cvmfslarsoft@oasiscfs.fnal.gov
148 5 Lynn Garren
* The README provides an overview of the necessary steps.
149 5 Lynn Garren
** start a transaction
150 5 Lynn Garren
** install using installBundle.sh
151 5 Lynn Garren
** publish
152 5 Lynn Garren
* installBundle.sh larsoft vaa_bb_cc_zz sNN-eY
153 5 Lynn Garren
** Note that if you call installBundle.sh with sNN-e17, it will install both e17 and c2 variants.
154 5 Lynn Garren
** The script will attempt to install the release for all supported platforms and clean up after itself.
155 23 Lynn Garren
** *If some expected distributions are not available, then manifests will be left in the .working subdirectory. Check and remove them if necessary.*