X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=docs%2Fjenkins.rst;h=a835bd1f124a835665e833b15fc0f7785b2d8b93;hb=6737d651d0b72d9f2a4a127bee152da831d0a917;hp=e8a0c1962de7d60a661f0ac4334d9953beb9654f;hpb=ce95944aa16fbf7151b6c8664aa72f11d46902f0;p=releng%2Fbuilder.git
diff --git a/docs/jenkins.rst b/docs/jenkins.rst
index e8a0c1962d..a835bd1f12 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
@@ -292,38 +288,14 @@ Pool: ODLVEX
- Jenkins Labels ubuntu1604-mininet-ovs-25-2c-2g |
- Minion Template names ubuntu1604-mininet-ovs-25-2c-2g |
- Packer Template releng/builder/packer/templates/mininet-ovs-2.5.json |
- Playbook releng/builder/packer/provision//mininet-ovs-2.5.yaml |
-
-
-
- Basic Ubuntu 16.04 (Xenial) system with ovs 2.5 and mininet 2.2.1
- |
-
-
-
- Jenkins Labels ubuntu1604-mininet-ovs-26-2c-2g |
- Minion Template names ubuntu1604-mininet-ovs-26-2c-2g |
- Packer Template releng/builder/packer/templates/mininet-ovs-2.6.json |
- Playbook releng/builder/packer/provision//mininet-ovs-2.6.yaml |
-
-
-
- Ubuntu 16.04 (Xenial) system with ovs 2.6 and mininet 2.2.1
- |
-
-
-
- Jenkins Labels ubuntu1604-mininet-ovs-28-2c-2g |
- Minion Template names ubuntu1604-mininet-ovs-28-2c-2g |
+ Jenkins Labels ubuntu1804-mininet-ovs-28-2c-2g |
+ Minion Template names ubuntu1804-mininet-ovs-28-2c-2g |
Packer Template releng/builder/packer/templates/mininet-ovs-2.8.json |
Playbook releng/builder/packer/provision//mininet-ovs-2.8.yaml |
- Ubuntu 16.04 (Xenial) system with ovs 2.8 and mininet 2.2.1
+ Ubuntu 18.04 (Bionic Beaver) system with ovs 2.8
|
@@ -357,18 +329,6 @@ Pool: ODLVEX
-
- Jenkins Labels ubuntu1604-gbp-2c-2g |
- Minion Template names ubuntu1604-gbp-2c-2g |
- Packer Template releng/builder/packer/templates/gbp.json |
- Spinup Script releng/builder/jenkins-scripts/gpb.sh |
-
-
-
- Ubuntu 16.04 (Xenial) node with latest OVS and docker installed. Used by Group Based Policy.
- |
-
-
Pool: ODLVEX - HOT (Heat Orchestration Templates)
@@ -821,19 +781,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 +800,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
@@ -853,18 +811,18 @@ Jenkins Sandbox documentation can be found in the
.. _jjb-docs: http://ci.openstack.org/jenkins-job-builder/
.. _jjb-init-project.py: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=blob;f=scripts/jjb-init-project.py
.. _jjb-repo: https://github.com/openstack-infra/jenkins-job-builder
-.. _jjb-requirements.txt: https://github.com/openstack-infra/jenkins-job-builder/blob/master/requirements.txt
+.. _jjb-requirements.txt: https://opendev.org/jjb/jenkins-job-builder/raw/branch/master/requirements.txt
.. _jjb-templates: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=tree;f=jjb
-.. _odl-jjb-requirements.txt: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=blob;f=jjb/requirements.txt
+.. _odl-jjb-requirements.txt: https://gerrit.linuxfoundation.org/infra/gitweb?p=releng/global-jjb.git;a=blob;f=requirements.txt;
.. _odl-nexus: https://nexus.opendaylight.org
.. _odl-sonar: https://sonar.opendaylight.org
.. _python-virtualenv: https://virtualenv.readthedocs.org/en/latest/
.. _python-virtualenvwrapper: https://virtualenvwrapper.readthedocs.org/en/latest/
-.. _releng-wiki: https://wiki.opendaylight.org/view/RelEng:Main
-.. _releng-builder-gerrit: https://git.opendaylight.org/gerrit/#/admin/projects/releng/builder
+.. _releng-wiki: https://docs.releng.linuxfoundation.org/en/latest/
+.. _releng-builder-gerrit: https://git.opendaylight.org/gerrit/admin/repos/releng%2Fbuilder
.. _releng-builder-repo: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=summary
.. _releng-global-jjb: https://gerrit.linuxfoundation.org/infra/#/q/project:releng/global-jjb
-.. _releng-builder-wiki: https://wiki.opendaylight.org/view/RelEng/Builder
+.. _releng-builder-wiki: https://wiki.opendaylight.org/pages/viewpage.action?pageId=329336
.. _streams-design-background: https://lists.opendaylight.org/pipermail/release/2015-July/003139.html
.. _spinup-scripts: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=tree;f=jenkins-scripts
.. _spinup-scripts-basic_settings.sh: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=blob;f=jenkins-scripts/basic_settings.sh