From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Fri, 21 Jun 2019 18:11:54 +0000 (-0700)
Subject: Add {stream} to releases jobs
X-Git-Tag: v0.39.0~2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F69%2F15969%2F1;p=releng%2Fglobal-jjb.git

Add {stream} to releases jobs

Add the {stream} variable to the verify and merge
releases jobs to make them:
{project-name}-releases-verfy-{stream} and
{project-name}-releases-merge-{stream}

Change-Id: I63dcd51ea5d6eaf2eb57442f72f7e2f339070a7d
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
---

diff --git a/docs/jjb/lf-release-jobs.rst b/docs/jjb/lf-release-jobs.rst
index 7375d481..b3a78e00 100644
--- a/docs/jjb/lf-release-jobs.rst
+++ b/docs/jjb/lf-release-jobs.rst
@@ -53,7 +53,7 @@ Runs:
 
 
 :Template Name:
-    - {project-name}-releases-merge
+    - {project-name}-releases-merge-{stream}
 
 :Comment Trigger: remerge
 
@@ -94,7 +94,7 @@ is available on the job.
 
 
 :Template Names:
-    - {project-name}-releases-verify
+    - {project-name}-releases-verify-{stream}
 
 :Comment Trigger: recheck|reverify
 
diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml
index c0e02453..9f7b25e1 100644
--- a/jjb/lf-release-jobs.yaml
+++ b/jjb/lf-release-jobs.yaml
@@ -98,7 +98,7 @@
       - lf-releases
 
 - job-template:
-    name: '{project-name}-releases-verify'
+    name: '{project-name}-releases-verify-{stream}'
     id: gerrit-releases-verify
     <<: *lf_releases_common
     # yamllint disable-line rule:key-duplicates
@@ -177,7 +177,7 @@
       - lf-releases
 
 - job-template:
-    name: '{project-name}-releases-merge'
+    name: '{project-name}-releases-merge-{stream}'
     id: gerrit-releases-merge
     <<: *lf_releases_common
     # yamllint disable-line rule:key-duplicates
diff --git a/releasenotes/notes/add-stream-releases-jobs-e75a277f6ebf9480.yaml b/releasenotes/notes/add-stream-releases-jobs-e75a277f6ebf9480.yaml
new file mode 100644
index 00000000..03cc5031
--- /dev/null
+++ b/releasenotes/notes/add-stream-releases-jobs-e75a277f6ebf9480.yaml
@@ -0,0 +1,4 @@
+---
+fixes:
+  - |
+    Add the {stream} name in releases-verify and releases-merge jobs.