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>

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index dd99e39df603f00ef8f8790c0f9b1813a32c10a9..e4da40ed7fcd0e77728d15163395fd13ca587625 100644 (file)
--- 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 33fd72b7fa08ef78f947e0a8ff63f0a28efccc1a..5d2c52a23d46ca67b3a5dd94af92f292400a4402 100644 (file)
--- 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: