From 87157af8e7d16b0750cd8981153e837555f87ad5 Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Tue, 13 Nov 2018 15:21:59 +0800
Subject: [PATCH] Move streamtestplan variable out of defaults.yaml

The problem with nesting variables in defaults.yaml is it causes
everyone, regardless of if they care about streamtestplan to
require the variables defined in streamtestplan to be required in
their templates. This is causes job-templates that never needed
these variables to have to define a dummy variable in order to
successfully pass.

Considering no existing csit jobs override the 'streamtestplan'
variable, remove it as a option and code the pattern into the
job-templates that use it.

Change-Id: Ib2355753031a908aafa7e43bcc01c34cce770e93
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 jjb/defaults.yaml                          | 1 -
 jjb/integration/integration-templates.yaml | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index dd99e39df..e4da40ed7 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -10,7 +10,6 @@
     scriptplan: '{project}.txt'
     configplan: '{project}.txt'
     testplan: '{project}-{functionality}.txt'
-    streamtestplan: '{project}-{functionality}-{stream}.txt'
     karaf-version: karaf4
     build-days-to-keep: 30
     use-features-boot: 'True'
diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 33fd72b7f..5d2c52a23 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -167,7 +167,7 @@
       - integration-config-plan:
           config-plan: '{configplan}'
       - integration-stream-test-plan:
-          stream-test-plan: '{streamtestplan}'
+          stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
           test-plan: '{testplan}'
       - integration-test-suites:
@@ -511,7 +511,7 @@
       - integration-config-plan:
           config-plan: '{configplan}'
       - integration-stream-test-plan:
-          stream-test-plan: '{streamtestplan}'
+          stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
           test-plan: '{testplan}'
       - integration-test-suites:
-- 
2.36.6