From: Andrew Grimberg Date: Mon, 20 Aug 2018 15:36:53 +0000 (+0000) Subject: Merge "Remove mvn-settings requirement from jjb job docs" X-Git-Tag: v0.24.0~9 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=50b5d5ad077ccc6c522d9ae8d844ed02e9c71d71;hp=-c;p=releng%2Fglobal-jjb.git Merge "Remove mvn-settings requirement from jjb job docs" --- 50b5d5ad077ccc6c522d9ae8d844ed02e9c71d71 diff --combined docs/jjb/lf-ci-jobs.rst index 849c4152,146ab45c..5d238585 --- a/docs/jjb/lf-ci-jobs.rst +++ b/docs/jjb/lf-ci-jobs.rst @@@ -391,8 -391,6 +391,6 @@@ Runs `jenkins-jobs update` to update pr :build-node: The node to run build on. :jenkins-ssh-credential: Credential to use for SSH. (Generally should be configured in defaults.yaml) - :mvn-settings: The name of settings file containing credentials for - the project. :Optional parameters: @@@ -400,7 -398,6 +398,7 @@@ :build-days-to-keep: Days to keep build logs in Jenkins. (default: 7) :build-timeout: Timeout in minutes before aborting build. (default: 10) :git-url: URL clone project from. (default: $GIT_URL/$PROJECT) + :jjb-version: JJB version to install. (default: see job-template) :stream: Keyword that can be used to represent a release code-name. Often the same as the branch. (default: master) :submodule-recursive: Whether to checkout submodules recursively. @@@ -429,8 -426,6 +427,6 @@@ Runs `jenkins-jobs test` to validate JJ :build-node: The node to run build on. :jenkins-ssh-credential: Credential to use for SSH. (Generally should be configured in defaults.yaml) - :mvn-settings: The name of settings file containing credentials for - the project. :Optional parameters: @@@ -438,7 -433,6 +434,7 @@@ :build-days-to-keep: Days to keep build logs in Jenkins. (default: 7) :build-timeout: Timeout in minutes before aborting build. (default: 10) :git-url: URL clone project from. (default: $GIT_URL/$PROJECT) + :jjb-version: JJB version to install. (default: see job-template) :stream: Keyword that can be used to represent a release code-name. Often the same as the branch. (default: master) :submodule-recursive: Whether to checkout submodules recursively.