Refactor common parameters into opendaylight-infra-parameters

- Pull in project-parameter
- Pull in gerrit-parameters
- Create ARCHIVE_ARTIFACTS parameter

Change-Id: Iea57ea1c558baf4825a4e0daddf32e320a4468df
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml
index 8a3b0b4d3cb9095e1387e17476822a2001bf4fd3..b9974501a467511eef2c18404195855f3511e71f 100644 (file)
--- a/jjb-templates/merge.yaml
+++ b/jjb-templates/merge.yaml
@@ -21,12 +21,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:

diff --git a/jjb-templates/sonar.yaml b/jjb-templates/sonar.yaml
index 47fba2d687428c07a65cab3a1977b0ac8251b07e..4223ebd6883c4ee3f81142a0797c968889715352 100644 (file)
--- a/jjb-templates/sonar.yaml
+++ b/jjb-templates/sonar.yaml
@@ -13,8 +13,11 @@
         artifactNumToKeep: '1'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - git-scm:

diff --git a/jjb-templates/verify.yaml b/jjb-templates/verify.yaml
index e995783f130904306f49f950fb316ff05ab86eff..3e1c5a903d4fe8c681d0b2ee71b291bd8035de5b 100644 (file)
--- a/jjb-templates/verify.yaml
+++ b/jjb-templates/verify.yaml
@@ -27,12 +27,11 @@
         daysToKeep: '14'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index ec0bbeea44dbee9db0edfc45e25908a396adabd6..e31cfc311eec7267a0fa8307291bf99e1d38407a 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -12,8 +12,11 @@
         artifactDaysToKeep: '14'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - autorelease-release-tag:
             release-tag: '{next-release-tag}'
         - autorelease-release-branch:
@@ -95,8 +98,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - string:
             name: REPORT_DIR
             default: '$WORKSPACE/project-reports'
@@ -166,12 +172,11 @@
         artifactNumToKeep: -1
 
     parameters:
-    - project-parameter:
-        project: '{project}'
-    - gerrit-parameters:
-        project: '{project}'
-        branch: '{branch}'
-        refspec: 'refs/heads/{branch}'
+        - opendaylight-infra-parameters:
+            project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
     - gerrit-trigger-scm:
@@ -218,12 +223,11 @@
         artifactNumToKeep: -1
 
     parameters:
-    - project-parameter:
-        project: '{project}'
-    - gerrit-parameters:
-        project: '{project}'
-        branch: '{branch}'
-        refspec: 'refs/heads/{branch}'
+        - opendaylight-infra-parameters:
+            project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
     - gerrit-trigger-scm:

diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml
index f6b69f114ee08b66aeb14388affff3e9ca2080c9..2776ea4d8211545cb956fc98db7d04eb2a0781ce 100644 (file)
--- a/jjb/docs/docs-rtd.yaml
+++ b/jjb/docs/docs-rtd.yaml
@@ -23,12 +23,11 @@
         daysToKeep: 14
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     wrappers:
         - opendaylight-infra-wrappers:
@@ -69,12 +68,11 @@
         daysToKeep: 14
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - git-scm-with-submodules:

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index 5013f52ab0805be74c14be363897518e45b3453d..066867173d1f034fbd03dc03ff777deaaeb812e7 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -37,12 +37,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: 'integration/distribution'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - integration-patch-refspec:
             branch: '$GERRIT_REFSPEC'
 
@@ -110,12 +109,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: 'integration/distribution'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:
@@ -215,8 +213,11 @@
         artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: 'integration/distribution'
+        - opendaylight-infra-parameters:
+            project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:
@@ -261,8 +262,11 @@
         artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: 'integration/distribution'
+        - opendaylight-infra-parameters:
+            project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: '{branch}'
         - integration-bundleurl:

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 32bb079e373eecb4e02317ab0b6a503c314f1c42..f96ef155fd36797662780cd4cd8e09db835bb672 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -10,7 +10,7 @@
 #
 # Parameters:
 #
-# project-parameter: main project integration/test ($PROJECT)
+# opendaylight-infra-parameters: main project integration/test ($PROJECT)
 # jre: (openjdk7 or openjdk8) Java runtime environment to use when launching ODL
 # integration-branch: distribution branch ($BRANCH)
 # integration-controller-bundleurl: distribution URL ($BUNDLEURL)
@@ -38,8 +38,11 @@
         artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: 'integration/test'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: 'stable/beryllium'
         - integration-distribution-stream:
@@ -120,8 +123,11 @@
         artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: 'integration/test'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: '{branch}'
         - integration-distribution-stream:
@@ -226,8 +232,11 @@
         artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: 'integration/test'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: '{branch}'
         - integration-distribution-stream:
@@ -331,8 +340,11 @@
         artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: 'integration/test'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: 'stable/beryllium'
         - integration-distribution-stream:
@@ -414,8 +426,11 @@
         artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: 'integration/test'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: '{branch}'
         - integration-distribution-stream:
@@ -521,8 +536,11 @@
         artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: 'integration/test'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: '{branch}'
         - integration-distribution-stream:
@@ -627,8 +645,11 @@
         artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: 'integration/test'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: '{branch}'
         - integration-distribution-stream:
@@ -729,8 +750,11 @@
         artifactNumToKeep: '{build-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: 'integration/test'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: '{branch}'
         - integration-distribution-stream:
@@ -841,12 +865,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: '$GERRIT_REFSPEC'
-        - project-parameter:
-            project: '{project}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: '{branch}'
         - integration-distribution-git-url

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index c2e84a0c980b2ed50b924d607a2d2c7ef8eedb1d..f01314702d3488c94ba6c920632764ee87e39292 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -183,8 +183,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: 'integration/test'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: 'stable/beryllium'
         - integration-distribution-stream:
@@ -313,12 +316,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '$GERRIT_PROJECT'
             branch: '{branch}'
             refspec: '$GERRIT_REFSPEC'
-        - project-parameter:
-            project: '$GERRIT_PROJECT'
+            artifacts: '{archive-artifacts}'
         - integration-branch:
             branch: '{branch}'
         - integration-distribution-git-url

diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml
index 31d74776c4ea6f52c102a43c67ec49070e2ac48a..496e6484c93245d8e6026c914c60b3c6f9e390b3 100644 (file)
--- a/jjb/netvirt/netvirt-full-integration.yaml
+++ b/jjb/netvirt/netvirt-full-integration.yaml
@@ -56,12 +56,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:

diff --git a/jjb/netvirt/netvirt-openstack.yaml b/jjb/netvirt/netvirt-openstack.yaml
index 9485d7a904b1fa6d50a480301be668557655b315..78b2364838de8ec728904bf596c022c3c174d1b0 100644 (file)
--- a/jjb/netvirt/netvirt-openstack.yaml
+++ b/jjb/netvirt/netvirt-openstack.yaml
@@ -17,8 +17,11 @@
         daysToKeep: '198'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     wrappers:
         - opendaylight-infra-wrappers:

diff --git a/jjb/netvirt/netvirt-sonar.yaml b/jjb/netvirt/netvirt-sonar.yaml
index ff5c021c35764ad06c2f54a5f813c6fcb6de8de3..897207f31efbe8fae093b7b87a4defb30dd07715 100644 (file)
--- a/jjb/netvirt/netvirt-sonar.yaml
+++ b/jjb/netvirt/netvirt-sonar.yaml
@@ -20,8 +20,11 @@
         artifactNumToKeep: '1'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - git-scm:

diff --git a/jjb/neutron/neutron-daily-openstack-beryllium.yaml b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
index 027b4f6ac947349525d4efafbfdb5f7fb4cc1dc1..127c900255539542703bb0862aeb79e5ae58e422 100644 (file)
--- a/jjb/neutron/neutron-daily-openstack-beryllium.yaml
+++ b/jjb/neutron/neutron-daily-openstack-beryllium.yaml
@@ -18,8 +18,11 @@
         daysToKeep: '198'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     wrappers:
         - opendaylight-infra-wrappers:

diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml
index 3613f3a5d94608be323ba815daf65ee0b4a32f9f..bc356d13052be396897818c444c70bdc0982ab8b 100644 (file)
--- a/jjb/opflex/opflex-custom.yaml
+++ b/jjb/opflex/opflex-custom.yaml
@@ -66,12 +66,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:
@@ -109,12 +108,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 16a1f838307cdef025c7a82977fb632816d2657c..a7390d5e835d17ba486c6bffbfa42c5fc5852990 100644 (file)
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -61,12 +61,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:

diff --git a/jjb/ovsdb/ovsdb-sonar.yaml b/jjb/ovsdb/ovsdb-sonar.yaml
index e3c7efc452f923d3a85d8c756cf5e4862989869d..fbc113c99ba7a6cd809c943ea4b8f8d221a2bed9 100644 (file)
--- a/jjb/ovsdb/ovsdb-sonar.yaml
+++ b/jjb/ovsdb/ovsdb-sonar.yaml
@@ -20,8 +20,11 @@
         artifactNumToKeep: '1'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - git-scm:

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 15c995b6024ed2b688be5f626f78b15c161cb3da..2b5e649c856f604cc5cd99ae7f3d35865e546209 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -10,6 +10,10 @@
     # Timeout in minutes
     build-timeout: 360
 
+    # openstack-infra-parameters defaults
+    archive-artifacts: ''
+    branch: master
+
     # Maven versions
     mvn30: 'Maven 3.0.5'
     mvn31: 'Maven 3.1.1'

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 0164773372c773e90a40fb6dcaaea4f18c65e849..6b406196d4a1fec71e92aa2956ca607e1fbf56f0 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -19,12 +19,11 @@
         daysToKeep: 7
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: 'master'
             refspec: 'refs/heads/master'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:
@@ -86,12 +85,11 @@
         artifactNumToKeep: -1
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: 'master'
             refspec: 'refs/heads/master'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:
@@ -156,12 +154,11 @@
         artifactNumToKeep: -1
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: 'master'
             refspec: 'refs/heads/master'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:
@@ -221,8 +218,11 @@
         artifactNumToKeep: -1
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: 'master'
+            refspec: 'refs/heads/master'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - git-scm:
@@ -257,6 +257,13 @@
         artifactDaysToKeep: -1
         artifactNumToKeep: -1
 
+    parameters:
+        - opendaylight-infra-parameters:
+            project: '{project}'
+            branch: 'master'
+            refspec: 'refs/heads/master'
+            artifacts: '{archive-artifacts}'
+
     wrappers:
         - opendaylight-infra-wrappers:
             build-timeout: '{build-timeout}'

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 119cab355f6d5beafb931840cd00f5f97d1ac608..df235566d82cae213954b58b567f35fb973b707b 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -1,16 +1,16 @@
 # OLD Releng macros
 
 - parameter:
-    name: project-parameter
+    name: opendaylight-infra-parameters
     parameters:
         - string:
             name: PROJECT
             default: '{project}'
-            description: "JJB configured PROJECT parameter to identify an ODL Gerrit project"
-
-- parameter:
-    name: gerrit-parameters
-    parameters:
+            description: 'Parameter to identify an ODL Gerrit project'
+        - string:
+            name: ARCHIVE_ARTIFACTS
+            default: '{artifacts}'
+            description: 'Artifacts to archive into logs.opendaylight.org'
         - string:
             name: GERRIT_PROJECT
             default: '{project}'

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 20ca05e4e306d562aea301dcdab36ccb8f97b414..de023cbd72de50881230f4594273cfd75220d09f 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -17,8 +17,11 @@
         numToKeep: '{build-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - git-scm:
@@ -76,8 +79,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: 'integration/distribution'
+        - opendaylight-infra-parameters:
+            project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - git-scm:
@@ -139,12 +145,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
-        - project-parameter:
-            project: '{project}'
+            artifacts: '{archive-artifacts}'
         - integration-distribution-git-url
 
     scm:
@@ -252,8 +257,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - git-scm:
@@ -314,8 +322,11 @@
         daysToKeep: '14'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - git-scm:
@@ -370,12 +381,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - autorelease-release-tag:
             release-tag: 'validate'
         - autorelease-release-branch:

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index c008bf02d5ab7942de27465cdaf17520c6c67140..edaef8b750ce779f01828b4ad654509c52209675 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -12,8 +12,11 @@
         daysToKeep: '30'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - build-tag
         - stage-id-parameter:
             stage-id: '{stage-id}'
@@ -68,8 +71,11 @@
     jdk: '{jdk}'
 
     parameters:
-        - project-parameter:
+        - opendaylight-infra-parameters:
             project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
         - p2zip-parameter
 
     wrappers:
@@ -130,12 +136,11 @@
         artifactNumToKeep: '-1'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - git:
@@ -198,12 +203,11 @@
     concurrent: false
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     wrappers:
         - opendaylight-infra-wrappers:
@@ -250,12 +254,11 @@
         artifactNumToKeep: '-1'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - git:

diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml
index de738aaa002cb6fff55bc93aba12bd4e7b470d33..97342786a3caf3ccd0203137a9fa1e1af158cc77 100644 (file)
--- a/jjb/sfc/sfc-python.yaml
+++ b/jjb/sfc/sfc-python.yaml
@@ -35,12 +35,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm:

diff --git a/jjb/yangtools/yangtools-verify.yaml b/jjb/yangtools/yangtools-verify.yaml
index a8d941e0fe1a4411ae47ae9f62b3d0eb16e1a2fa..4df26fadcde06dce8e2d87db602058039bc9db5d 100644 (file)
--- a/jjb/yangtools/yangtools-verify.yaml
+++ b/jjb/yangtools/yangtools-verify.yaml
@@ -76,12 +76,11 @@
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
+        - opendaylight-infra-parameters:
             project: '{project}'
             branch: '{branch}'
             refspec: 'refs/heads/{branch}'
+            artifacts: '{archive-artifacts}'
 
     scm:
         - gerrit-trigger-scm: