Fix jenkins doc after latest changes 06/51206/1
authorLuis Gomez <ecelgp@gmail.com>
Mon, 30 Jan 2017 17:43:56 +0000 (09:43 -0800)
committerLuis Gomez <ecelgp@gmail.com>
Mon, 30 Jan 2017 17:43:56 +0000 (09:43 -0800)
Change-Id: I090c9774bbed321bc94c9a84065585a8eff28a28
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
docs/jenkins.rst

index d5a5fee9511576323859e6158283c47fb343ad63..ae2dbc0c91c0ab8c0e18fa12ce4388bacf1fbe4f 100644 (file)
@@ -572,17 +572,6 @@ TODO: Document test-{project}-{feature} and test-{project}-all.
 .. raw:: html
 
     <table class="table table-bordered">
-      <tr class="warning">
-        <td><b>Job Template</b><br/>{project}-distribution-{stream}</td>
-      </tr>
-      <tr>
-        <td colspan="2">
-          This job builds a snapshot distribution. This is triggered by successful merge job,
-          so the distribution contains newest project artifacts.
-          This job then triggers subset of sanity CSIT jobs relevant for the project.
-        </td>
-      </tr>
-
       <tr class="warning">
         <td><b>Job Template</b><br/>{project}-distribution-check-{stream}</td>
         <td><b>Gerrit Trigger</b><br/>recheck</td>
@@ -623,6 +612,9 @@ TODO: Document test-{project}-{feature} and test-{project}-all.
           Artifacts are uploaded to OpenDaylight's
           <a href="https://nexus.opendaylight.org">Nexus</a> on completion.
 
+          A distribution-merge-{stream} job is triggered to add the new artifacts to the
+          integration distribution.
+
           Running the "remerge" trigger is possible before a Change is merged,
           it would still build the actual HEAD. This job does not alter Gerrit votes.
         </td>