Consolidate controller parameters into new macro

These parameters are all related to controller configuration so
consolidate them into a single macro to manage the variables
together.

Change-Id: If298349d60852d96b3af446620d6c5e799f1a3f8
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index dff504740b240d78381e39281870f373dd464a55..195bfc0c1cfa7d75715f55190399ad56ea454521 100644 (file)
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -410,8 +410,12 @@
           bundle-url: '{bundle-url}'
       - integration-repo-url:
           repo-url: '{sm-repos}'
-      - integration-controller-features:
+      - integration-controller-parameters:
           controller-features: '{sm-features}'
+          # Parameters below are unused in this job so set them all to blank
+          controller-debug-map: ''
+          controller-scope: ''
+          controller-use-features-boot: ''
       - integration-jdk-version:
           jdkversion: '{jre}'
       - distribution-karaf-version:

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index b5e826825e8f0ed2f086f4a2ab7030e113a98be4..b533504f12e72fa5de9816f4dc1e223a1d1e8168 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -18,15 +18,38 @@
           repo-url: '{repo-url}'
       - integration-test-options:
           test-options: '{robot-options}'
-      # Controller
-      - integration-controller-scope:
-          controller-scope: '{controller-scope}'
-      - integration-controller-debug-map:
+      - integration-controller-parameters:
           controller-debug-map: '{debug-map}'
-      - integration-controller-features:
           controller-features: '{install-features}'
-      - integration-use-features-boot:
-          use-features-boot: '{use-features-boot}'
+          controller-scope: '{controller-scope}'
+          controller-use-features-boot: '{use-features-boot}'
+
+- parameter:
+    name: integration-controller-parameters
+    parameters:
+      - string:
+          name: CONTROLLERSCOPE
+          default: '{controller-scope}'
+          description: 'Feature Only or Feature All test'
+
+      - string:
+          name: CONTROLLERFEATURES
+          default: '{controller-features}'
+          description: 'Features to install in the controller separated by comma'
+
+      - string:
+          name: CONTROLLERDEBUGMAP
+          default: '{controller-debug-map}'
+          description: |
+              Key:Value map of debugs to enable on the controller separated by spaces.
+              The module should not include org.opendaylight.
+              The levels must be one of: ERROR, WARN, INFO, DEBUG, TRACE.
+              (ex. ovsdb.lib:ERROR netvirt.vpnservice:INFO)
+
+      - string:
+          name: USEFEATURESBOOT
+          default: '{controller-use-features-boot}'
+          description: 'Boolean to toggle whether featuresBoot is appended or ignored'
 
 
 - parameter:
@@ -71,34 +94,6 @@
           default: '{jdkversion}'
           description: 'Parameter to indicate JAVA Version'
 
-- parameter:
-    name: integration-controller-scope
-    parameters:
-      - string:
-          name: CONTROLLERSCOPE
-          default: '{controller-scope}'
-          description: 'Feature Only or Feature All test'
-
-- parameter:
-    name: integration-controller-features
-    parameters:
-      - string:
-          name: CONTROLLERFEATURES
-          default: '{controller-features}'
-          description: 'Features to install in the controller separated by comma'
-
-- parameter:
-    name: integration-controller-debug-map
-    parameters:
-      - string:
-          name: CONTROLLERDEBUGMAP
-          default: '{controller-debug-map}'
-          description: |
-              Key:Value map of debugs to enable on the controller separated by spaces.
-              The module should not include org.opendaylight.
-              The levels must be one of: ERROR, WARN, INFO, DEBUG, TRACE.
-              (ex. ovsdb.lib:ERROR netvirt.vpnservice:INFO)
-
 - parameter:
     name: integration-distribution-stream
     parameters:
@@ -175,14 +170,6 @@
           default: '{branch}'
           description: 'Integration Patch Refspec'
 
-- parameter:
-    name: integration-use-features-boot
-    parameters:
-      - string:
-          name: USEFEATURESBOOT
-          default: '{use-features-boot}'
-          description: 'Boolean to toggle whether featuresBoot is appended or ignored'
-
 # Macro: integration-gerrit-scm
 # Operation: this macro downloads a project gerrit
 # Used by: all csit jobs