From 5eda0e0f59e224b8ba9775ef3fafbb28edd4177a Mon Sep 17 00:00:00 2001 From: Jamo Luhrsen Date: Thu, 9 Mar 2017 18:52:09 -0800 Subject: [PATCH] Make testplan more configurable before our standard 1node and 3node templates had to have testplans of the format {project}-{functionality}.txt. That is still the default, but now a project can override the testplan by defining a testplan element in their project jjb yaml. Change-Id: I922f8feadf3f69b4c4b1e0bc36ee0fc07741af56 Signed-off-by: Jamo Luhrsen --- jjb/integration/integration-templates.yaml | 8 ++++++-- jjb/ovsdb/ovsdb-csit-clustering.yaml | 2 ++ jjb/ovsdb/ovsdb-csit-southbound.yaml | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 8fc01a762..465418ed6 100644 --- 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: diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index 1608c00b6..c0b29826f 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -7,6 +7,8 @@ # The project name project: 'ovsdb' + testplan: 'ovsdb-clustering.txt' + # The functionality under test functionality: - 'upstream-clustering' diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index 142e5e28d..4ae58f9ca 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -7,11 +7,14 @@ # The project name project: 'ovsdb' + testplan: 'ovsdb-southbound.txt' + # The functionality under test functionality: - 'upstream-southbound' - 'gate-southbound' + # Project branches stream: - carbon: -- 2.36.6