From 2b1d4843a35590537a35e6efdac9bac84d11ddf6 Mon Sep 17 00:00:00 2001 From: Houa Yang Date: Mon, 25 Nov 2019 17:35:02 +0000 Subject: [PATCH] Revert "Fix lf-release-jobs packagecloud jobname" This reverts commit 0fca5e8ba63946ad8dd568e545c9568c2c60f84f. This also corrects the names to follow current standard. Reason for revert: Revert to correct naming to comply with naming standard already in use. Change-Id: Ida9cb7b0a9d2909066c6f146fef3de39de3a1674 Signed-off-by: Houa Yang --- docs/jjb/lf-release-jobs.rst | 4 ++-- jjb/lf-release-jobs.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) 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 -- 2.16.6