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
Make gerrit-branch-lock work for all proj/branches
[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
20dde4e
..
0fa7081
100644
(file)
--- a/
docs/jjb/lf-ci-jobs.rst
+++ b/
docs/jjb/lf-ci-jobs.rst
@@
-107,10
+107,13
@@
Job Templates
Gerrit Branch Lock
------------------
Gerrit Branch Lock
------------------
-Job submits a patch to lock or unlock a project's branch.
+Job submits a patch to lock or unlock a project's branch. This should only be
+loaded once, as "ci-management-gerrit-branch-lock" (or "ci-management"
+equivalent). That job will process lock/unlock requests for all projects and
+all branches.
:Template Names:
:Template Names:
- - {project-name}-gerrit-branch-lock
-{stream}
+ - {project-name}-gerrit-branch-lock
- gerrit-branch-lock
:Comment Trigger:
- gerrit-branch-lock
:Comment Trigger:
@@
-126,14
+129,9
@@
Job submits a patch to lock or unlock a project's branch.
:Optional parameters:
:Optional parameters:
- :branch: Git branch to build against. (default: master)
:git-url: URL to clone project from. (default: $GIT_URL/$GERRIT_PROJECT)
:git-url: URL to clone project from. (default: $GIT_URL/$GERRIT_PROJECT)
- :stream: Keyword that can be used to represent a release code-name.
- Often the same as the branch. (default: master)
:submodule-timeout: Timeout (in minutes) for checkout operation.
(default: 10)
:submodule-timeout: Timeout (in minutes) for checkout operation.
(default: 10)
- :submodule-disable: Disable submodule checkout operation.
- (default: false)
:gerrit_merge_triggers: Override Gerrit Triggers.
.. _lf-global-jjb-jenkins-cfg-merge:
:gerrit_merge_triggers: Override Gerrit Triggers.
.. _lf-global-jjb-jenkins-cfg-merge:
@@
-887,14
+885,19
@@
Requires ``SonarQube Scanner for Jenkins``
Plug-in configurations
Manage Jenkins --> Configure System --> SonarQube servers
- Name: Sonar (fixed)
Plug-in configurations
Manage Jenkins --> Configure System --> SonarQube servers
- Name: Sonar (fixed)
- - Server URL: https://sonar.server.org/
- - Server authentication token: none
+ - Server URL: https://sonar.server.org/ or https://sonarcloud.io
+ - Server authentication token: none for local, API token (saved as a
+ "secret text" credential) for Sonarcloud
Manage Jenkins --> Global Tool Configuration --> SonarQube Scanner
- Name: SonarQube Scanner (fixed)
- Install automatically
- Select latest version
Manage Jenkins --> Global Tool Configuration --> SonarQube Scanner
- Name: SonarQube Scanner (fixed)
- Install automatically
- Select latest version
+.. note:: Sonar properties can be set directly in the job definition by
+ setting the sonar-project-file to ``""`` and adding all properties under
+ ``sonar-properties``.
+
:Template Names:
- {project-name}-sonar
:Template Names:
- {project-name}-sonar
@@
-903,6
+906,8
@@
Plug-in configurations
:Optional Parameters:
:sonar-task: Sonar task to run. (default: "")
:Optional Parameters:
:sonar-task: Sonar task to run. (default: "")
+ :sonar-project-file: The filename for the project's properties
+ (default: "sonar-project.properties")
:sonar-properties: Sonar configuration properties. (default: "")
:sonar-java-opts: JVM options. (default: "")
:sonar-additional-args: Additional command line arguments. (default: "")
:sonar-properties: Sonar configuration properties. (default: "")
:sonar-java-opts: JVM options. (default: "")
:sonar-additional-args: Additional command line arguments. (default: "")
@@
-933,6
+938,8
@@
to run prior to the Sonar scan.
:Optional Parameters:
:sonar-task: Sonar task to run. (default: "")
:Optional Parameters:
:sonar-task: Sonar task to run. (default: "")
+ :sonar-project-file: The filename for the project's properties
+ (default: "sonar-project.properties")
:sonar-properties: Sonar configuration properties. (default: "")
:sonar-java-opts: JVM options. (default: "")
:sonar-additional-args: Additional command line arguments. (default: "")
:sonar-properties: Sonar configuration properties. (default: "")
:sonar-java-opts: JVM options. (default: "")
:sonar-additional-args: Additional command line arguments. (default: "")