X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=docs%2Fjenkins.rst;h=ef5e1462cdfc26b99a738708eb934b5658d8784b;hb=93698bed93c807dd1ee40e1fca4ca348f97c2cff;hp=486ce85780ffb8082c352433ad4c19c843977915;hpb=10e2648b2fd712c8d856f5ec9dd813fa180a7e1e;p=releng%2Fbuilder.git
diff --git a/docs/jenkins.rst b/docs/jenkins.rst
index 486ce8578..ef5e1462c 100644
--- a/docs/jenkins.rst
+++ b/docs/jenkins.rst
@@ -260,8 +260,8 @@ Pool: ODLVEX
prd-centos7-autorelease-4c-16g
Packer Template
releng/builder/packer/templates/builder.json |
- Spinup Script
- releng/builder/jenkins-scripts/builder.sh |
+ Playbook
+ releng/builder/packer/common-packer/provision/baseline.yaml |
|
@@ -278,7 +278,7 @@ Pool: ODLVEX
| Minion Template names
centos7-robot-2c-2g |
Packer Template
releng/builder/packer/templates/robot.json |
- Spinup Script
releng/builder/jenkins-scripts/robot.sh |
+ Playbook
releng/builder/packer/provision/robot.yaml |
|
@@ -292,27 +292,38 @@ Pool: ODLVEX
|
- Jenkins Labels
ubuntu1404-mininet-2c-2g |
- Minion Template names
ubuntu1404-mininet-2c-2g |
- Packer Template
- releng/builder/packer/teamplates/mininet.json |
- Spinup Script
releng/builder/jenkins-scripts/mininet-ubuntu.sh |
+ 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 |
|
- Basic Ubuntu 14.04 (Trusty) system with ovs 2.0.2 and mininet 2.1.0
+ Ubuntu 16.04 (Xenial) system with ovs 2.6 and mininet 2.2.1
|
- Jenkins Labels
ubuntu1404-mininet-ovs-23-2c-2g |
- Minion Template names
ubuntu1404-mininet-ovs-23-2c-2g |
- Packer Template
releng/builder/packer/templates/mininet-ovs-2.3.json |
- Spinup Script
releng/builder/jenkins-scripts/mininet-ubuntu.sh |
+ Jenkins Labels
ubuntu1604-mininet-ovs-28-2c-2g |
+ Minion Template names
ubuntu1604-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.5 and mininet 2.2.1
+ Ubuntu 16.04 (Xenial) system with ovs 2.8 and mininet 2.2.1
|
@@ -320,7 +331,7 @@ Pool: ODLVEX
Jenkins Labels
centos7-devstack-2c-4g |
Minion Template names
centos7-devstack-2c-4g |
Packer Template
releng/builder/packer/templates/devstack.json |
- Spinup Script
releng/builder/jenkins-scripts/devstack.sh |
+ Playbook
releng/builder/packer/provision/devstack.yaml |
|
@@ -335,7 +346,7 @@ Pool: ODLVEX
| Jenkins Labels
centos7-docker-2c-4g |
Minion Template names
centos7-docker-2c-4g |
Packer Template
releng/builder/packer/templates/docker.json |
- Spinup Script
releng/builder/jenkins-scripts/docker.sh |
+ Playbook
releng/builder/packer/common-packer/provision/docker.yaml |
|
@@ -810,19 +821,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:
@@ -831,7 +840,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
|