From 6b4185916890e54ee4f773a0bd34a9c44a38dcf8 Mon Sep 17 00:00:00 2001 From: Trevor Bramwell Date: Thu, 18 Jan 2018 12:11:00 -0800 Subject: Add GERRIT_REFSPEC to 'project-parameter' Macro GERRIT_REFSPEC is always passed by the gerrit-trigger plugin when a job is triggered by Gerrit. Because it is not explicily defined, there is no way to manually trigger jobs, as the git clone looks up the list of refs by GERRIT_REFSPEC. Being able to manually trigger jobs (with node parameters so they can be restricted) is very helpful in debugging CI issues. Change-Id: I8a1d9ea380902fc95f30482e5acb616347709ab1 Signed-off-by: Trevor Bramwell --- jjb/apex/apex-project-jobs.yml | 4 ---- jjb/ci_gate_security/opnfv-ci-gate-security.yml | 4 ---- jjb/global/releng-macros.yml | 4 ++++ jjb/qtip/qtip-verify-jobs.yml | 4 ---- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/jjb/apex/apex-project-jobs.yml b/jjb/apex/apex-project-jobs.yml index b12b1015c..58072865d 100644 --- a/jjb/apex/apex-project-jobs.yml +++ b/jjb/apex/apex-project-jobs.yml @@ -46,10 +46,6 @@ branch: '{branch}' - apex-parameter: gs-pathname: '{gs-pathname}' - - string: - name: GERRIT_REFSPEC - default: 'refs/heads/{branch}' - description: "JJB configured GERRIT_REFSPEC parameter" scm: - git-scm-gerrit diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yml b/jjb/ci_gate_security/opnfv-ci-gate-security.yml index d54aebea4..56aee174c 100644 --- a/jjb/ci_gate_security/opnfv-ci-gate-security.yml +++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yml @@ -103,10 +103,6 @@ - project-parameter: project: '{repo}' branch: '{branch}' - - string: - name: GERRIT_REFSPEC - default: 'refs/heads/{stream}' - description: "Default Gerrit ref git HEAD should point to" scm: - git-scm-gerrit diff --git a/jjb/global/releng-macros.yml b/jjb/global/releng-macros.yml index 330584e25..c6a65ca21 100644 --- a/jjb/global/releng-macros.yml +++ b/jjb/global/releng-macros.yml @@ -35,6 +35,10 @@ name: GERRIT_BRANCH default: '{branch}' description: "JJB configured GERRIT_BRANCH parameter (deprecated)" + - string: + name: GERRIT_REFSPEC + default: 'refs/heads/{branch}' + description: "Default refspec needed for manually triggering." - property: name: logrotate-default diff --git a/jjb/qtip/qtip-verify-jobs.yml b/jjb/qtip/qtip-verify-jobs.yml index 783c92b04..8698fa055 100644 --- a/jjb/qtip/qtip-verify-jobs.yml +++ b/jjb/qtip/qtip-verify-jobs.yml @@ -122,10 +122,6 @@ name: GS_URL default: '$GS_BASE{gs-pathname}' description: "Directory where the build artifact will be located upon the completion of the build." - - string: - name: GERRIT_REFSPEC - default: 'refs/heads/{branch}' - description: "JJB configured GERRIT_REFSPEC parameter" scm: - git-scm -- cgit 1.2.3-korg