summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyota Mibu <r-mibu@cq.jp.nec.com>2018-01-24 09:51:48 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-01-24 09:51:48 +0000
commit4b1560c6499e53efb3b2ca83294265052396b2d5 (patch)
tree18433ee1676895d49e557a08d95e2da6cf7ddbd4
parentda95fe6416a07fde7619002395ed0ec5a956ce02 (diff)
parent6b4185916890e54ee4f773a0bd34a9c44a38dcf8 (diff)
Merge "Add GERRIT_REFSPEC to 'project-parameter' Macro"
-rw-r--r--jjb/apex/apex-project-jobs.yml4
-rw-r--r--jjb/ci_gate_security/opnfv-ci-gate-security.yml4
-rw-r--r--jjb/global/releng-macros.yml4
-rw-r--r--jjb/qtip/qtip-verify-jobs.yml4
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