X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=docs%2Fjjb%2Flf-ci-jobs.rst;h=af5ad74db3da4023ed55adf905e64e90ca72f032;hb=f372e4b60011bbcad7ecebca82a24144b42fe19f;hp=3ddec148d1f992b9a2eb9b9d2cce23b85774ffdd;hpb=1d1aaf33f079ee4f51dfce68e8f5592a649947ca;p=releng%2Fglobal-jjb.git diff --git a/docs/jjb/lf-ci-jobs.rst b/docs/jjb/lf-ci-jobs.rst index 3ddec148..af5ad74d 100644 --- a/docs/jjb/lf-ci-jobs.rst +++ b/docs/jjb/lf-ci-jobs.rst @@ -59,6 +59,11 @@ Manages the Global Jenkins variables. This macro will clear all exist macros in Jenkins and replaces them with the ones defined by the ci-management/jenkins-config/global-vars-SILO.sh script. +.. note:: + + Requires the jjbini file in Jenkins CFP to contain JJB 2.0 style + config definitions for "production" and "sandbox" systems. + :Required parameters: :jenkins-silos: Space separated list of Jenkins silos to update @@ -125,6 +130,11 @@ The format for this file is ``KEY=value`` for example:: SILO=sandbox SONAR_URL=https://sonar.opendaylight.org +.. note:: + + Requires the jjbini file in Jenkins CFP to contain JJB 2.0 style + config definitions for "production" and "sandbox" systems. + :Template names: - {project-name}-jenkins-cfg-merge