X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=docs%2Fjenkins.rst;h=46855cef7b453e4ddf049812fc7763ce3d741d9e;hb=12ff4462f008d0370648d1bc0a06d2b5b814175e;hp=e8a0c1962de7d60a661f0ac4334d9953beb9654f;hpb=8e35c48f867df3bbadfb1ee17d86243a473951be;p=releng%2Fbuilder.git
diff --git a/docs/jenkins.rst b/docs/jenkins.rst
index e8a0c1962..46855cef7 100644
--- a/docs/jenkins.rst
+++ b/docs/jenkins.rst
@@ -204,23 +204,19 @@ accounts in the cloud so should ensure consistent performance.
- CPUs
- Memory
- * - odl-standard-1
- - 1
- - 4
-
- * - odl-standard-2
+ * - v3-standard-2
- 2
- 8
- * - odl-standard-4
+ * - v3-standard-4
- 4
- 16
- * - odl-standard-8
+ * - v3-standard-8
- 8
- 32
- * - odl-standard-16
+ * - v3-standard-16
- 16
- 64
@@ -821,19 +817,17 @@ Maven Properties
----------------
We provide a properties which your job can take advantage of if you want to do
-something different depending on the job type that is run. If you create a
-profile that activates on a property listed blow. The JJB templated jobs will
-be able to activate the profile during the build to run any custom code you
-wish to run in your project.
+trigger a different configuration depending on job type. You can create a
+profile that activates on a property listed below. The JJB templated jobs will
+activate the profile during the build to run any custom code configuration you
+wish to run for this job type.
.. code-block:: bash
- -Dmerge : This flag is passed in our Merge job and is equivalent to the
- Maven property
- true.
- -Dsonar : This flag is passed in our Sonar job and is equivalent to the
- Maven property
- true.
+ -Dmerge : The Merge job sets this flag and is the same as setting the
+ Maven property true.
+ -Dsonar : The Sonar job sets this flag and is the same as setting the
+ Maven property true.
.. _odl-jenkins-sandbox:
@@ -842,7 +836,7 @@ Jenkins Sandbox
URL: https://jenkins.opendaylight.org/sandbox
-Jenkins Sandbox documentation can be found in the
+Jenkins Sandbox documentation is available in the
:doc:`LF Jenkins Sandbox Guide `.
.. _example-jenkins.ini: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=blob;f=jenkins.ini.example