From: Anil Belur Date: Thu, 30 Jan 2020 02:19:56 +0000 (+1000) Subject: Update docs with missing cloud config params X-Git-Tag: v0.51.0~11^2 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=df463747cfe78050b60eda18c4bfb58538cd7dad;p=releng%2Fglobal-jjb.git Update docs with missing cloud config params Also correct the default value as defined in the jenkins-configure-clouds.sh script. Change-Id: I56cae3723339e8f8ec2630db2dd7744d95b8ec49 Signed-off-by: Anil Belur --- diff --git a/docs/jjb/lf-ci-jobs.rst b/docs/jjb/lf-ci-jobs.rst index 0fa70814..d3f343ed 100644 --- a/docs/jjb/lf-ci-jobs.rst +++ b/docs/jjb/lf-ci-jobs.rst @@ -243,11 +243,12 @@ configuration in the format ``KEY=value``. In the case of template definitions of a parameter below is not passed the one defined in default clouds will be inherited. - :IMAGE_NAME: The image name to use for this template. - (required) + :IMAGE_NAME: The image name to use for this template. (required) :HARDWARE_ID: OpenStack flavor to use. (required) :LABELS: Labels to assign to the vm. (default: FILE_NAME) + :VOLUME_SIZE: Volume size to assign to vm. (default: "") + :HARDWARE_ID: Hardware Id to assign to vm. (default: "") :NETWORK_ID: OpenStack network to use. (default: "") :USER_DATA_ID: User Data to pass into the instance. (default: jenkins-init-script) @@ -264,16 +265,18 @@ configuration in the format ``KEY=value``. :START_TIMEOUT: Number of milliseconds to wait for the agent to be provisioned and connected. (default: 600000) :KEY_PAIR_NAME: SSH Public Key Pair to use for authentication. - (default: jenkins) + (default: jenkins-ssh) :NUM_EXECUTORS: Number of executors to enable for the instance. (default: 1) - :JVM_OPTIONS: JVM Options to pass to Java. (default: "") + :JVM_OPTIONS: JVM Options to pass to Java. (default: null) :FS_ROOT: File system root for the workspace. (default: "/w") + :NODE_PROPERTIES: Node properties. (default: null) :RETENTION_TIME: Number of minutes to wait for an idle slave to be used again before it's removed. If set to -1, the slave will be kept forever. (default: 0) :CONNECTION_TYPE: The connection type for Jenkins to connect to the build minion. Valid options: JNLP, SSH. (default: "SSH") + :CONFIG_TYPE: Configuration drive. (default: null) For a live example see the OpenDaylight project jenkins-config directory. https://github.com/opendaylight/releng-builder/tree/master/jenkins-config