From a21f59ac052b896be4f3a15799e050b6d6b707ba Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 30 Jul 2019 21:14:41 +0200 Subject: [PATCH] Move project and gerrit parameters back to job templates Change-Id: Ic238daba0fdde29c2b09dc191c7938dba0ec00eb --- jjb/cloud-infra/cloud-infra-periodic-onap.yaml | 12 ++++++++++++ jjb/cloud-infra/onap-macros.yaml | 4 ---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml index 169aa233..327a6ba9 100644 --- a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml +++ b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml @@ -110,6 +110,10 @@ concurrent: true parameters: + - project-parameters: + project: '{project}' + branch: '{nordix-branch}' + - nordix-gerrit-parameters - onap-parameter-macro - string: name: ONAP_VERSION @@ -362,6 +366,10 @@ - logrotate parameters: + - project-parameters: + project: '{project}' + branch: '{nordix-branch}' + - nordix-gerrit-parameters - onap-parameter-macro - string: name: ONAP_VERSION @@ -402,6 +410,10 @@ - logrotate parameters: + - project-parameters: + project: '{project}' + branch: '{nordix-branch}' + - nordix-gerrit-parameters - onap-parameter-macro - string: name: ONAP_VERSION diff --git a/jjb/cloud-infra/onap-macros.yaml b/jjb/cloud-infra/onap-macros.yaml index 9ff14254..12795bdf 100644 --- a/jjb/cloud-infra/onap-macros.yaml +++ b/jjb/cloud-infra/onap-macros.yaml @@ -22,10 +22,6 @@ - parameter: name: 'onap-parameter-macro' parameters: - - project-parameters: - project: '{project}' - branch: '{nordix-branch}' - - nordix-gerrit-parameters - label: name: SLAVE_LABEL default: 'jumphost-onap-ubuntu1804' -- 2.25.1