Make stream for CSIT verify configurable

Change-Id: I48ed352fbe6937fb9f675298741f9b037e01b3d9
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index d8e4106cde619ae0a9e5bd1cb66e426c76206f55..c56bf1cb29fe2d4762e70a2de9578c159fe01b84 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1,6 +1,6 @@
 # Job templates in this file (please update with every new template):
+# FIXME: Update
 #
-# New (for Be release):
 # {project}-csit-verify-1node-{functionality}
 # {project}-csit-1node-{functionality}-{install}-{stream}
 # {project}-csit-1node-periodic-{functionality}-{install}-{stream}
@@ -9,6 +9,7 @@
 # {project}-csit-3node-periodic-{functionality}-{install}-{stream}
 #
 # Parameters:
+# FIXME: Distinguish variables, macros and arguments, then update.
 #
 # opendaylight-infra-parameters: main project integration/test ($PROJECT)
 # jre: (openjdk7 or openjdk8) Java runtime environment to use when launching ODL
@@ -42,9 +43,9 @@
             refspec: 'refs/heads/{branch}'
             artifacts: '{archive-artifacts}'
         - integration-branch:
-            branch: 'stable/boron'
+            branch: '{verify-branch}'
         - integration-distribution-stream:
-            stream: 'boron'
+            stream: '{verify-stream}'
         - integration-bundleurl:
             bundleurl: '{bundleurl}'
         - integration-controller-scope:
@@ -54,11 +55,11 @@
         - integration-test-options:
             test-options: '{robot-options}'
         - integration-stream-test-plan:
-            stream-test-plan: '{project}-{functionality}-boron.txt'
+            stream-test-plan: '{project}-{functionality}-{verify-stream}.txt'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
-            jdkversion: 'openjdk8'
+            jdkversion: '{verify-jdkversion}'
 
     scm:
         - integration-gerrit-scm:
@@ -452,9 +453,9 @@
             refspec: 'refs/heads/{branch}'
             artifacts: '{archive-artifacts}'
         - integration-branch:
-            branch: 'stable/boron'
+            branch: '{verify-branch}'
         - integration-distribution-stream:
-            stream: 'boron'
+            stream: '{verify-stream}'
         - integration-bundleurl:
             bundleurl: '{bundleurl}'
         - integration-controller-scope:
@@ -464,11 +465,11 @@
         - integration-test-options:
             test-options: '{robot-options}'
         - integration-stream-test-plan:
-            stream-test-plan: '{project}-{functionality}-boron.txt'
+            stream-test-plan: '{project}-{functionality}-{verify-stream}.txt'
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
-            jdkversion: 'openjdk8'
+            jdkversion: '{verify-jdkversion}'
 
     scm:
         - integration-gerrit-scm:

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 26d79e7adcff5bab1f86ff23992351a7579363bb..6fdb920d28c64181596c40c665ac821873804369 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -36,9 +36,16 @@
     tools_system_flavor: 2 GB General Purpose v1
     tools_system_image: Ubuntu 14.04 - mininet - 20170117-0003
 
-    # Robot
+    # Default Robot framework options
     robot-options: ''
 
+    # Data for csit-verify jobs
+    # Branch for "last" version detection
+    verify-branch: 'stable/boron'
+    # Value for ODL_STREAM
+    verify-stream: 'boron'
+    verify-jdkversion: 'openjdk8'
+
     # In case a CSIT job is merged without Java version specified
     jdk: 'openjdk8'