Merge "Fix script indent to 4 spaces"

[releng/global-jjb.git] / docs / jjb / lf-release-jobs.rst

diff --git a/docs/jjb/lf-release-jobs.rst b/docs/jjb/lf-release-jobs.rst
index 47559fa..8565235 100644 (file)
--- a/docs/jjb/lf-release-jobs.rst
+++ b/docs/jjb/lf-release-jobs.rst
@@ -28,7 +28,7 @@ Macros
 ======
 
 lf-releases
 ======
 
 lf-releases

-----------------------
+-----------

 
 Release verify and merge jobs are the same except for their scm, trigger, and
 builders definition. This anchor is the common template.
 
 Release verify and merge jobs are the same except for their scm, trigger, and
 builders definition. This anchor is the common template.


@@ -53,7 +53,7 @@ Runs:
 
 
 :Template Name:
 
 
 :Template Name:

-    - {project-name}-releases-merge
+    - {project-name}-releases-merge-{stream}

 
 :Comment Trigger: remerge
 
 
 :Comment Trigger: remerge
 


@@ -70,10 +70,6 @@ Runs:
     :build-days-to-keep: Days to keep build logs in Jenkins. (default: 7)
     :build-timeout: Timeout in minutes before aborting build. (default: 15)
     :project-pattern: Project to trigger build against. (default: \*\*)
     :build-days-to-keep: Days to keep build logs in Jenkins. (default: 7)
     :build-timeout: Timeout in minutes before aborting build. (default: 15)
     :project-pattern: Project to trigger build against. (default: \*\*)

-    :submodule-recursive: Whether to checkout submodules recursively.
-        (default: false)
-    :submodule-timeout: Timeout (in minutes) for checkout operation.
-        (default: 10)

 
     :gerrit_merge_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths filter which checks which
 
     :gerrit_merge_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths filter which checks which


@@ -98,7 +94,7 @@ is available on the job.
 
 
 :Template Names:
 
 
 :Template Names:

-    - {project-name}-releases-verify
+    - {project-name}-releases-verify-{stream}

 
 :Comment Trigger: recheck|reverify
 
 
 :Comment Trigger: recheck|reverify
 


@@ -120,10 +116,6 @@ is available on the job.
     :gerrit-skip-vote: Skip voting for this job. (default: false)
     :git-url: URL clone project from. (default: $GIT_URL/$PROJECT)
     :project-pattern: Project to trigger build against. (default: \*\*)
     :gerrit-skip-vote: Skip voting for this job. (default: false)
     :git-url: URL clone project from. (default: $GIT_URL/$PROJECT)
     :project-pattern: Project to trigger build against. (default: \*\*)

-    :submodule-recursive: Whether to checkout submodules recursively.
-        (default: false)
-    :submodule-timeout: Timeout (in minutes) for checkout operation.
-        (default: 10)

 
     :gerrit_verify_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths filter which checks which
 
     :gerrit_verify_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths filter which checks which