Make testplan more configurable

[releng/builder.git] / jjb / integration / integration-templates.yaml

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 8fc01a7629112721b7ae843d85eadef3bf712f9b..465418ed6a697476be54fff3e86fd3b079ff90e8 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -122,6 +122,8 @@
       - opendaylight-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
 
+    testplan: '{project}-{functionality}.txt'
+
     parameters:
       - opendaylight-infra-parameters:
           project: 'integration/test'
@@ -143,7 +145,7 @@
       - integration-stream-test-plan:
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
-          test-plan: '{project}-{functionality}.txt'
+          test-plan: '{testplan}'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
@@ -538,6 +540,8 @@
       - opendaylight-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
 
+    testplan: '{project}-{functionality}.txt'
+
     parameters:
       - opendaylight-infra-parameters:
           project: 'integration/test'
@@ -559,7 +563,7 @@
       - integration-stream-test-plan:
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
-          test-plan: '{project}-{functionality}.txt'
+          test-plan: '{testplan}'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version: