Merge "Standardize "release" wording"

diff --git a/.jjb-test/lf-release-jobs.yaml b/.jjb-test/lf-release-jobs.yaml
index 26a3dd3..73f6ec3 100644 (file)
--- a/.jjb-test/lf-release-jobs.yaml
+++ b/.jjb-test/lf-release-jobs.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: '{project-name}-releases'
+    name: '{project-name}-release'
     jobs:
       - '{project-name}-gerrit-release-jobs'
 

diff --git a/docs/jjb/lf-macros.rst b/docs/jjb/lf-macros.rst
index 6772eee..32aa2be 100644 (file)
--- a/docs/jjb/lf-macros.rst
+++ b/docs/jjb/lf-macros.rst
@@ -247,8 +247,8 @@ check-info-votes
 
 Calls shell script to validate votes on a change to an INFO.yaml
 
-lf-releases
------------
+lf-release
+----------
 
 releases lftools.ini (required)
 needed to push to nexus.

diff --git a/docs/jjb/lf-release-jobs.rst b/docs/jjb/lf-release-jobs.rst
index 8565235..87932f8 100644 (file)
--- a/docs/jjb/lf-release-jobs.rst
+++ b/docs/jjb/lf-release-jobs.rst
@@ -27,8 +27,8 @@ configfiles with a [nexus] section for auth.
 Macros
 ======
 
-lf-releases
------------
+lf-release
+----------
 
 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:
-    - {project-name}-releases-merge-{stream}
+    - {project-name}-release-merge-{stream}
 
 :Comment Trigger: remerge
 
@@ -94,7 +94,7 @@ is available on the job.
 
 
 :Template Names:
-    - {project-name}-releases-verify-{stream}
+    - {project-name}-release-verify-{stream}
 
 :Comment Trigger: recheck|reverify
 

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 82dc840..1e697cf 100644 (file)
--- a/jjb/lf-macros.yaml
+++ b/jjb/lf-macros.yaml
@@ -272,7 +272,7 @@
       - shell: !include-raw-escape: ../shell/check-info-votes.sh
 
 - builder:
-    name: lf-releases
+    name: lf-release
     builders:
       - config-file-provider:
           files:

diff --git a/jjb/lf-release-job-groups.yaml b/jjb/lf-release-job-groups.yaml
index 41ba20a..27bdf24 100644 (file)
--- a/jjb/lf-release-job-groups.yaml
+++ b/jjb/lf-release-job-groups.yaml
@@ -6,5 +6,5 @@
     # for any project using self releases.
 
     jobs:
-      - gerrit-releases-verify
-      - gerrit-releases-merge
+      - gerrit-release-verify
+      - gerrit-release-merge

diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml
index c384e5d..dc3807a 100644 (file)
--- a/jjb/lf-release-jobs.yaml
+++ b/jjb/lf-release-jobs.yaml
@@ -11,8 +11,8 @@
 # COMMON FUNCTIONS #
 ####################
 
-- lf_releases_common: &lf_releases_common
-    name: lf-releases-common
+- lf_release_common: &lf_release_common
+    name: lf-release-common
 
     ######################
     # Default parameters #
@@ -51,8 +51,8 @@
 # RELEASE VERIFY #
 ##################
 
-- lf_releases_verify: &lf_releases_verify
-    name: lf-releases-verify
+- lf_release_verify: &lf_release_verify
+    name: lf-release-verify
 
     ######################
     # Default parameters #
@@ -95,14 +95,14 @@
               variable: SIGUL_PKI
       - shell: !include-raw-escape: ../shell/sigul-configuration.sh
       - shell: !include-raw-escape: ../shell/sigul-install.sh
-      - lf-releases
+      - lf-release
 
 - job-template:
-    name: '{project-name}-releases-verify-{stream}'
-    id: gerrit-releases-verify
-    <<: *lf_releases_common
+    name: '{project-name}-release-verify-{stream}'
+    id: gerrit-release-verify
+    <<: *lf_release_common
     # yamllint disable-line rule:key-duplicates
-    <<: *lf_releases_verify
+    <<: *lf_release_verify
 
     scm:
       - lf-infra-gerrit-scm:
@@ -137,8 +137,8 @@
 # RELEASE MERGE #
 #################
 
-- lf_releases_merge: &lf_releases_merge
-    name: lf-releases-merge
+- lf_release_merge: &lf_release_merge
+    name: lf-release-merge
 
     ######################
     # Default parameters #
@@ -175,14 +175,14 @@
               variable: SIGUL_PKI
       - shell: !include-raw-escape: ../shell/sigul-configuration.sh
       - shell: !include-raw-escape: ../shell/sigul-install.sh
-      - lf-releases
+      - lf-release
 
 - job-template:
-    name: '{project-name}-releases-merge-{stream}'
-    id: gerrit-releases-merge
-    <<: *lf_releases_common
+    name: '{project-name}-release-merge-{stream}'
+    id: gerrit-release-merge
+    <<: *lf_release_common
     # yamllint disable-line rule:key-duplicates
-    <<: *lf_releases_merge
+    <<: *lf_release_merge
 
     scm:
       - lf-infra-gerrit-scm:

diff --git a/releasenotes/notes/standardize_release_version_job-81eb03ef2c798827.yaml b/releasenotes/notes/standardize_release_version_job-81eb03ef2c798827.yaml
new file mode 100644 (file)
index 0000000..a90c096
--- /dev/null
+++ b/releasenotes/notes/standardize_release_version_job-81eb03ef2c798827.yaml
@@ -0,0 +1,18 @@
+---
+upgrade:
+  - |
+    This change will require to update lf-release-job calls.
+    Update from using "{project-name}-releases-merge-{stream}",
+    "{project-name}-releases-verify-{stream}" to "{project-name}-release-merge-{stream}",
+    "{project-name}-release-verify-{stream}".
+    No upgrade need to be done if using "{project-name}-gerrit-release-jobs"
+    group.
+
+fixes:
+  - |
+    Using "releases" and "release" in different places is becoming confusing.
+    Standardize to "release" to match lftools command and the majority of the
+    exisiting wording.
+
+    Use "releases" for the list of tech team releases and trggers since it is
+    intuitive there. For example "releases/1.1.1.yaml"