Move project and gerrit parameters back to job templates

Change-Id: Ic238daba0fdde29c2b09dc191c7938dba0ec00eb

diff --git a/jjb/cloud-infra/cloud-infra-periodic-onap.yaml b/jjb/cloud-infra/cloud-infra-periodic-onap.yaml
index 169aa23346e273d7cbf304aa2e6809eb14db4c00..327a6ba9195c5cdfab24a2df0ba1b1569553616a 100644 (file)
--- 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 9ff14254695b9bb75cd37521d08b9f3f9be30935..12795bdf95236bd645b3c36c7077b051660c79d4 100644 (file)
--- 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'