From 24529ff4590c82e0a0c56edab8dabe9ff98cd35d Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Tue, 19 Jun 2018 13:13:41 -0400 Subject: [PATCH] Document undocumented ci-jobs macros Change-Id: Iad4d692f393802716378dabc9770ba0f38967d92 Signed-off-by: Thanh Ha --- docs/jjb/lf-ci-jobs.rst | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/docs/jjb/lf-ci-jobs.rst b/docs/jjb/lf-ci-jobs.rst index 70a6fa21..453035ab 100644 --- a/docs/jjb/lf-ci-jobs.rst +++ b/docs/jjb/lf-ci-jobs.rst @@ -70,6 +70,30 @@ Jobs related to Packer builds for CI using GitHub. Macros ====== +lf-infra-jjb-parameters +----------------------- + +:Required Parameters: + + :jjb-version: Version of Jenkins Job Builder (JJB) to install and use in + the jjb jobs. + +lf-jenkins-cfg-clouds +--------------------- + +Deploys Jenkins Cloud configuration read from the ``jenkins-clouds`` directory +in ci-management repositories. + +.. 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 + configuration for as defined in ~/.config/jenkins_jobs/jenkins_jobs.ini + lf-jenkins-cfg-global-vars -------------------------- @@ -84,7 +108,7 @@ ci-management/jenkins-config/global-vars-SILO.sh script. :Required parameters: - :jenkins-silos: Space separated list of Jenkins silos to update + :jenkins-silos: Space-separated list of Jenkins silos to update configuration for as defined in ~/.config/jenkins_jobs/jenkins_jobs.ini lf-infra-jjbini -- 2.16.6