Skip to content

Commit 3f1ec7e

Browse files
1 parent 40453ff commit 3f1ec7e

File tree

2 files changed

+32
-27
lines changed

2 files changed

+32
-27
lines changed

jenkins.html

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,16 @@ <h3 id="wheel">Wheel</h3>
374374
<span class="nb">source env</span>/bin/activate
375375
</code></pre></div></div>
376376

377+
<h1 id="disabling-builds-on-pull-requests">Disabling Builds on Pull Requests</h1>
378+
379+
<p>For draft pull requests that may have frequent updates to the remote branch,
380+
it can be useful to disable the builds that run automatically. This can be done
381+
by adding the label <code class="language-plaintext highlighter-rouge">status: defer ci</code>. Jobs will automatically be reported
382+
back to the pull request as failures, but won’t run the actual build. Since
383+
these jobs are required to merge, this label will eventually need to be removed.
384+
Comment <code class="language-plaintext highlighter-rouge">@drake-jenkins-bot retest this please</code> after removing the label to
385+
trigger a re-run.</p>
386+
377387
<h1 id="testing-via-external-examples">Testing via External Examples</h1>
378388

379389
<p>The examples within Drake’s

release_playbook.html

Lines changed: 22 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -176,39 +176,33 @@ <h2 id="prior-to-release">Prior to release</h2>
176176
<li>Choose the next version number.</li>
177177
<li>Create a local Drake branch named <code class="language-plaintext highlighter-rouge">release_notes-v1.N.0</code> (so that others
178178
can easily find and push to it after the PR is opened).</li>
179-
<li>As the first commit on the branch, mimic the commit
180-
<a href="https://github.com/RobotLocomotion/drake/commit/cb6f616ced5496ea7863db46d86551930c9d61f7"><code class="language-plaintext highlighter-rouge">drake@cb6f616ced</code></a>
181-
in order to disable CI. A quick way to do this might be:
182-
<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre class="highlight"><code>git fetch upstream cb6f616ced5496ea7863db46d86551930c9d61f7
183-
git cherry-pick FETCH_HEAD
184-
</code></pre></div> </div>
179+
<li>Bootstrap the release notes file using the
180+
<code class="language-plaintext highlighter-rouge">tools/release_engineering/relnotes</code> tooling, with <code class="language-plaintext highlighter-rouge">--action=create</code>
181+
for the first run. Instructions can be found atop its source code:
182+
<a href="https://github.com/RobotLocomotion/drake/blob/master/tools/release_engineering/relnotes.py"><code class="language-plaintext highlighter-rouge">relnotes.py</code></a>.
183+
<ul>
184+
<li>The output is draft release notes in <code class="language-plaintext highlighter-rouge">doc/_release-notes/v1.N.0.md</code>.</li>
185+
<li>The version numbers in <code class="language-plaintext highlighter-rouge">doc/_pages/from_binary.md</code> should also have
186+
been automatically upgraded.
187+
Commit the results.</li>
188+
</ul>
185189
</li>
186190
<li>Push that branch and then open a new pull request titled:
187191
<div class="language-plaintext highlighter-rouge"><div class="highlight"><pre class="highlight"><code>[doc] Add release notes v1.N.0
188192
</code></pre></div> </div>
189193
<p>Make sure that “Allow edits by maintainers” on the GitHub PR page is
190-
enabled (the checkbox is checked). Set label <code class="language-plaintext highlighter-rouge">release notes: none</code>.</p>
194+
enabled (the checkbox is checked). Set the labels <code class="language-plaintext highlighter-rouge">release notes: none</code>
195+
and <code class="language-plaintext highlighter-rouge">status: defer ci</code> to disable CI while notes-only updates are ongoing.</p>
191196
</li>
192-
<li>For release notes, on an ongoing basis, add recent commit messages to the
193-
release notes draft using the <code class="language-plaintext highlighter-rouge">tools/release_engineering/relnotes</code> tooling.
194-
(Instructions can be found atop its source code: <a href="https://github.com/RobotLocomotion/drake/blob/master/tools/release_engineering/relnotes.py"><code class="language-plaintext highlighter-rouge">relnotes.py</code></a>)
195-
<ol>
196-
<li>On the first run, use <code class="language-plaintext highlighter-rouge">--action=create</code> to bootstrap the file.
197-
<ul>
198-
<li>The output is draft release notes in <code class="language-plaintext highlighter-rouge">doc/_release-notes/v1.N.0.md</code>.</li>
199-
<li>The version numbers in <code class="language-plaintext highlighter-rouge">doc/_pages/from_binary.md</code> should also have
200-
been automatically upgraded.</li>
201-
</ul>
202-
</li>
203-
<li>On the subsequent runs, use <code class="language-plaintext highlighter-rouge">--action=update</code> to refresh the file.
204-
<ul>
205-
<li>Try to avoid updating the release notes to refer to changes newer than
197+
<li>Make gradual updates to the release notes using
198+
<code class="language-plaintext highlighter-rouge">tools/release_engineering/relnotes</code>, with <code class="language-plaintext highlighter-rouge">--action=update</code> to
199+
refresh the file.
200+
<ul>
201+
<li>Try to avoid updating the release notes to refer to changes newer than
206202
the likely release, i.e., if you run <code class="language-plaintext highlighter-rouge">--update</code> on the morning you’re
207203
actually doing the release, be sure to pass the <code class="language-plaintext highlighter-rouge">--target_commit=</code>
208204
argument to avoid including commits that will not be part of the tag.</li>
209-
</ul>
210-
</li>
211-
</ol>
205+
</ul>
212206
</li>
213207
<li>For release notes, on an ongoing basis, clean up and relocate the commit
214208
notes to properly organized and wordsmithed bullet points. See <a href="#polishing-the-release-notes">Polishing
@@ -220,11 +214,11 @@ <h2 id="prior-to-release">Prior to release</h2>
220214
<li>As the release is nearly ready, post a call for action for feature teams to
221215
look at the draft document and provide suggestions (in reviewable) or fixes
222216
(as pushes).
223-
<ol>
217+
<ul>
224218
<li>To help ensure that the “newly deprecated APIs” section is accurate, grep
225219
the code for <code class="language-plaintext highlighter-rouge">YYYY-MM-01</code> deprecation notations, for the <code class="language-plaintext highlighter-rouge">MM</code> values
226220
that would have been associated with our +3 months typical period.</li>
227-
</ol>
221+
</ul>
228222
</li>
229223
</ol>
230224

@@ -341,7 +335,8 @@ <h2 id="cutting-the-release">Cutting the release</h2>
341335
<code class="language-plaintext highlighter-rouge">newest_commit</code> whose changes are enumerated in the notes.</li>
342336
</ol>
343337
</li>
344-
<li>Re-enable CI by reverting the commit you added way up above in step 3 of <strong>Prior to release</strong>.</li>
338+
<li>Re-enable CI by removing the label <code class="language-plaintext highlighter-rouge">status: defer ci</code> and commenting
339+
<code class="language-plaintext highlighter-rouge">@drake-jenkins-bot retest this please</code> to trigger a re-run.</li>
345340
<li>Wait for the wheel builds to complete, and then download release artifacts:
346341
<ol>
347342
<li>Use the

0 commit comments

Comments
 (0)