From: Houa Yang <hyang@contractor.linuxfoundation.org>
Date: Mon, 25 Nov 2019 18:55:21 +0000 (+0000)
Subject: Merge "Revert "Fix lf-release-jobs packagecloud jobname""
X-Git-Tag: v0.49.0~25
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=98c1e382ce72ee76c628c4741e17753c89901e07;hp=9424c8da8763456069c524776357f6e6da4bed38;p=releng%2Fglobal-jjb.git

Merge "Revert "Fix lf-release-jobs packagecloud jobname""
---

diff --git a/docs/jjb/lf-release-jobs.rst b/docs/jjb/lf-release-jobs.rst
index 73e04c76..cd0e1b55 100644
--- a/docs/jjb/lf-release-jobs.rst
+++ b/docs/jjb/lf-release-jobs.rst
@@ -472,7 +472,7 @@ PackageCloud Release Verify
 
 This template supports PackageCloud release jobs.
 
-:Template Name: {project-name}-packagecloud-verify
+:Template Name: {project-name}-packagecloud-release-verify
 
 :Comment Trigger: recheck|reverify
 
@@ -506,7 +506,7 @@ PackageCloud Release Merge
 
 This template supports PackageCloud release jobs.
 
-:template name: {project-name}-packagecloud-merge
+:template name: {project-name}-packagecloud-release-merge
 
 :comment trigger: remerge
 
diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml
index fa7a7551..a854c9fa 100644
--- a/jjb/lf-release-jobs.yaml
+++ b/jjb/lf-release-jobs.yaml
@@ -540,8 +540,8 @@
       - lf-release
 
 - job-template:
-    name: "{project-name}-packagecloud-verify"
-    id: gerrit-packagecloud-verify
+    name: "{project-name}-packagecloud-release-verify"
+    id: gerrit-packagecloud-release-verify
     <<: *lf_release_common
     # yamllint disable-line rule:key-duplicates
     <<: *lf_packagecloud_verify
@@ -631,8 +631,8 @@
       - lf-release
 
 - job-template:
-    name: "{project-name}-packagecloud-merge"
-    id: gerrit-packagecloud-merge
+    name: "{project-name}-packagecloud-release-merge"
+    id: gerrit-packagecloud-release-merge
     <<: *lf_release_common
     # yamllint disable-line rule:key-duplicates
     <<: *lf_packagecloud_merge