Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix deprecation warning to not execute code
[releng/global-jjb.git]
/
docs
/
jjb
/
lf-ci-jobs.rst
diff --git
a/docs/jjb/lf-ci-jobs.rst
b/docs/jjb/lf-ci-jobs.rst
index
6a8caff
..
b2905f3
100644
(file)
--- a/
docs/jjb/lf-ci-jobs.rst
+++ b/
docs/jjb/lf-ci-jobs.rst
@@
-138,7
+138,7
@@
Typically this template is automatically pulled in by the
"{project-name}-ci-jobs" job-group and does not need to be explicitly called if
the job group is being used.
"{project-name}-ci-jobs" job-group and does not need to be explicitly called if
the job group is being used.
-Mini
am
l Example:
+Mini
ma
l Example:
.. literalinclude:: ../../.jjb-test/lf-ci-jobs/jenkins-cfg-merge-minimal.yaml
:language: yaml
.. literalinclude:: ../../.jjb-test/lf-ci-jobs/jenkins-cfg-merge-minimal.yaml
:language: yaml
@@
-205,7
+205,7
@@
configuration in the format ``KEY=value``.
(default: "os-cloud")
:INSTANCE_CAP: Total number of instances the cloud will allow spin up.
(default: null)
(default: "os-cloud")
:INSTANCE_CAP: Total number of instances the cloud will allow spin up.
(default: null)
- :SANDBOX_CAP: Total number of instances the clo
du
will allow to
+ :SANDBOX_CAP: Total number of instances the clo
ud
will allow to
spin up. This applies to "sandbox" systems and overrides the
INSTANCE_CAP setting. (default: null)
spin up. This applies to "sandbox" systems and overrides the
INSTANCE_CAP setting. (default: null)