Merge "Rename maven-release job to maven-stage"

diff --git a/.jjb-test/lf-maven-jobs.yaml b/.jjb-test/lf-maven-jobs.yaml
index ccd517b..a42214a 100644 (file)
--- a/.jjb-test/lf-maven-jobs.yaml
+++ b/.jjb-test/lf-maven-jobs.yaml
@@ -6,8 +6,8 @@
       - gerrit-maven-javadoc-publish
       - gerrit-maven-javadoc-verify
       - gerrit-maven-merge
-      - gerrit-maven-release
       - gerrit-maven-sonar
+      - gerrit-maven-stage
       - gerrit-maven-verify
       - gerrit-maven-verify-dependencies
 
@@ -25,8 +25,8 @@
       - github-maven-javadoc-publish
       - github-maven-javadoc-verify
       - github-maven-merge
-      - github-maven-release
       - github-maven-sonar
+      - github-maven-stage
       - github-maven-verify
 
     project-name: github-maven

diff --git a/docs/jjb/lf-maven-jobs.rst b/docs/jjb/lf-maven-jobs.rst
index 519306e..02de9f1 100644 (file)
--- a/docs/jjb/lf-maven-jobs.rst
+++ b/docs/jjb/lf-maven-jobs.rst
@@ -13,7 +13,7 @@ Jobs for Maven projects using Gerrit.
 :Includes:
 
     - gerrit-maven-clm
-    - gerrit-maven-release
+    - gerrit-maven-stage
     - gerrit-maven-verify
     - gerrit-maven-verify-dependencies
 
@@ -25,7 +25,7 @@ Jobs for Maven projects using GitHub.
 :Includes:
 
     - github-maven-clm
-    - github-maven-release
+    - github-maven-stage
     - github-maven-verify
 
 {project-name}-maven-javadoc-jobs
@@ -289,19 +289,22 @@ This job uses the following strategy to deploy jobs to Nexus:
     :gerrit_trigger_file_paths: Override file paths which can be used to
         filter which file modifications will trigger a build.
 
-Maven Release
--------------
+Maven Stage
+-----------
 
 Produces a release candidate by creating a staging repo in Nexus.
 
-Runs a Maven build and deploys to $WORKSPACE/m2repo directory. This
-directory can then be reused later to deploy to Nexus.
+The staging repo name is in the format PROJECT-NUMBER for example "aaa-1234",
+"autorelease-2000", "odlparent-1201", etc...
+
+This job runs a Maven build and deploys to $WORKSPACE/m2repo directory. This
+directory is then used later to deploy to Nexus.
 
 :Template Names:
 
-    - {project-name}-maven-release-{stream}
-    - gerrit-maven-release
-    - github-maven-release
+    - {project-name}-maven-stage-{stream}
+    - gerrit-maven-stage
+    - github-maven-stage
 
 :Required parameters:
 

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 664c7f6..7a57470 100644 (file)
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -11,7 +11,7 @@
     jobs:
       - gerrit-maven-clm
       - gerrit-maven-merge
-      - gerrit-maven-release
+      - gerrit-maven-stage
       - gerrit-maven-verify
       - gerrit-maven-verify-dependencies
 
@@ -25,7 +25,7 @@
     jobs:
       - github-maven-clm
       - github-maven-merge
-      - github-maven-release
+      - github-maven-stage
       - github-maven-verify
 
 - job-group:
@@ -677,12 +677,12 @@
             - '{branch}'
           included-regions: '{obj:github_included_regions}'
 
-#################
-# Maven Release #
-#################
+###############
+# Maven Stage #
+###############
 
-- lf_maven_release: &lf_maven_release
-    name: lf-maven-release
+- lf_maven_stage: &lf_maven_stage
+    name: lf-maven-stage
 
     ######################
     # Default parameters #
@@ -705,7 +705,7 @@
 
     gerrit_release_triggers:
       - comment-added-contains-event:
-          comment-contains-value: build release$
+          comment-contains-value: stage-release$
 
     #####################
     # Job Configuration #
@@ -731,11 +731,11 @@
       - lf-provide-maven-settings-cleanup
 
 - job-template:
-    name: '{project-name}-maven-release-{stream}'
-    id: gerrit-maven-release
+    name: '{project-name}-maven-stage-{stream}'
+    id: gerrit-maven-stage
     <<: *lf_maven_common
     # yamllint disable-line rule:key-duplicates
-    <<: *lf_maven_release
+    <<: *lf_maven_stage
 
     scm:
       - lf-infra-gerrit-scm:
@@ -759,11 +759,11 @@
                   branch-pattern: '**/{branch}'
 
 - job-template:
-    name: '{project-name}-maven-release-{stream}'
-    id: github-maven-release
+    name: '{project-name}-maven-stage-{stream}'
+    id: github-maven-stage
     <<: *lf_maven_common
     # yamllint disable-line rule:key-duplicates
-    <<: *lf_maven_release
+    <<: *lf_maven_stage
 
     properties:
       - lf-infra-properties: