Merge "move network id to local jenkins configuration managed files"

[releng/builder.git] / docs / jenkins.rst

diff --git a/docs/jenkins.rst b/docs/jenkins.rst
index 2c0d629441ccd1272d188642a8cc0334a3d4e9a2..8e89d67ab33477196aee806f046ae79c6ac82cf3 100644 (file)
--- a/docs/jenkins.rst
+++ b/docs/jenkins.rst
@@ -42,7 +42,6 @@ Next we will create <new-project>.yaml as follows:
         name: <NEW_PROJECT>-carbon
         jobs:
             - '{project-name}-clm-{stream}'
-            - '{project-name}-distribution-{stream}'
             - '{project-name}-integration-{stream}'
             - '{project-name}-merge-{stream}'
             - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -189,12 +188,13 @@ Pool: ODLRPC
 
     <table class="table table-bordered">
       <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> dynamic_controller, dynamic_verify,
-          dynamic_merge, centos7-java-builder-2c-4g, centos7-java-builder-2c-8g,
-          centos7-java-builder-4c-8g</td>
+        <td><b>Jenkins Labels</b><br/> centos7-java-builder-2c-4g,
+          centos7-java-builder-2c-8g, centos7-java-builder-4c-8g,
+          centos7-java-builder-8c-8g, centos7-java-builder-4c-16g</td>
         <td><b>Minion Template names</b><br/> centos7-java-builder-2c-4g,
-          centos7-java-builder-2c-8g, centos7-java-builder-2c-8g,
-          centos7-java-builder-4c-8g, centos7-java-builder-8c-8g</td>
+          centos7-java-builder-2c-4g, centos7-java-builder-2c-8g,
+          centos7-java-builder-4c-8g, centos7-java-builder-8c-8g,
+          centos7-java-builder-4c-16g</td>
         <td><b>Packer Template</b><br/>
         releng/builder/packer/templates/java-builder.json</td>
         <td><b>Spinup Script</b><br/>
@@ -202,7 +202,7 @@ Pool: ODLRPC
       </tr>
       <tr>
         <td colspan="4">
-          A CentOS 7 huild minion. This system has OpenJDK 1.7 (Java7) and OpenJDK
+          A CentOS 7 build minion. This system has OpenJDK 1.7 (Java7) and OpenJDK
           1.8 (Java8) installed on it along with all the other components and
           libraries needed for building any current OpenDaylight project. This is
           the label that is used for all basic verify, merge and daily builds for
@@ -211,7 +211,7 @@ Pool: ODLRPC
       </tr>
 
       <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> dynamic_robot, centos7-robot-2c-2g</td>
+        <td><b>Jenkins Labels</b><br/> centos7-robot-2c-2g</td>
         <td><b>Minion Template names</b><br/> centos7-robot-2c-2g</td>
         <td><b>Packer Template</b><br/>
         releng/builder/packer/templates/robot.json</td>
@@ -268,7 +268,7 @@ Pool: ODLRPC
       </tr>
 
       <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> dynamic_devstack, centos7-devstack-2c-4g</td>
+        <td><b>Jenkins Labels</b><br/> centos7-devstack-2c-4g</td>
         <td><b>Minion Template names</b><br/> centos7-devstack-2c-4g</td>
         <td><b>Packer Template</b><br/> releng/builder/packer/templates/devstack.json</td>
         <td><b>Spinup Script</b><br/> releng/builder/jenkins-scripts/devstack.sh</td>
@@ -283,7 +283,7 @@ Pool: ODLRPC
       </tr>
 
       <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> dynamic_docker, centos7-docker-2c-4g</td>
+        <td><b>Jenkins Labels</b><br/> centos7-docker-2c-4g</td>
         <td><b>Minion Template names</b><br/> centos7-docker-2c-4g</td>
         <td><b>Packer Template</b><br/> releng/builder/packer/templates/docker.json</td>
         <td><b>Spinup Script</b><br/> releng/builder/jenkins-scripts/docker.sh</td>
@@ -573,17 +573,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>
@@ -624,6 +613,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>