Consolidate common csit params into macro

New integration-csit-parameters macro holds all common parameters
used by CSIT jobs into a single macro.

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

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 8b591a6c922a4e0c41924bf70cb3ecd11eedb25b..b5e826825e8f0ed2f086f4a2ab7030e113a98be4 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -1,6 +1,34 @@
 ---
 # TODO: Make all bash constants more readable.
 # e.g.: DISTRIBUTION_BRANCH instead of DISTROBRANCH.
+
+- parameter:
+    name: integration-csit-parameters
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: 'integration/test'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      # CSIT
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
+      - integration-test-options:
+          test-options: '{robot-options}'
+      # Controller
+      - integration-controller-scope:
+          controller-scope: '{controller-scope}'
+      - integration-controller-debug-map:
+          controller-debug-map: '{debug-map}'
+      - integration-controller-features:
+          controller-features: '{install-features}'
+      - integration-use-features-boot:
+          use-features-boot: '{use-features-boot}'
+
+
 - parameter:
     name: integration-distribution-branch
     parameters:

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index f2324ea187993f0a474d2c3706687c7fa13b0bea..08883283a8d0226c072cf0ad993b965608f7f426 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -70,26 +70,23 @@
     <<: *inttest_csit_common
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: '{os-cloud}'
+          # CSIT
+          bundle-url: '{bundle-url}'
+          repo-url: '{repo-url}'
+          robot-options: '{robot-options}'
+          # Controller
+          controller-scope: only
+          debug-map: '{debug-map}'
+          install-features: '{install-features}'
+          use-features-boot: 'True'
       - integration-distribution-branch:
           branch: '{verify-branch}'
       - integration-distribution-stream:
           stream: '{verify-stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-url}'
-      - integration-controller-scope:
-          controller-scope: 'only'
-      - integration-controller-features:
-          controller-features: '{install-features}'
-      - integration-test-options:
-          test-options: '{robot-options}'
       - integration-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
@@ -102,8 +99,7 @@
           jdkversion: '{verify-jdkversion}'
       - distribution-karaf-version:
           karaf-version: '{verify-karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: 'True'
+
     scm:
       - integration-gerrit-scm:
           basedir: 'test'
@@ -167,28 +163,23 @@
     #####################
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: '{os-cloud}'
+          # CSIT
+          bundle-url: '{bundle-url}'
+          repo-url: '{repo-url}'
+          robot-options: '{robot-options}'
+          # Controller
+          controller-scope: '{scope}'
+          debug-map: '{debug-map}'
+          install-features: '{install-features}'
+          use-features-boot: 'True'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-url}'
-      - integration-controller-scope:
-          controller-scope: '{scope}'
-      - integration-controller-features:
-          controller-features: '{install-features}'
-      - integration-controller-debug-map:
-          controller-debug-map: '{debug-map}'
-      - integration-test-options:
-          test-options: '{robot-options}'
       - integration-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
@@ -205,8 +196,6 @@
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: 'True'
 
     scm:
       - integration-gerrit-scm:
@@ -406,28 +395,23 @@
     <<: *inttest_csit_1node
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: '{os-cloud}'
+          # CSIT
+          bundle-url: '{bundle-url}'
+          repo-url: '{repo-url}'
+          robot-options: '{robot-options}'
+          # Controller
+          controller-scope: '{scope}'
+          debug-map: '{debug-map}'
+          install-features: '{install-features}'
+          use-features-boot: 'True'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-url}'
-      - integration-controller-scope:
-          controller-scope: '{scope}'
-      - integration-controller-features:
-          controller-features: '{install-features}'
-      - integration-controller-debug-map:
-          controller-debug-map: '{debug-map}'
-      - integration-test-options:
-          test-options: '{robot-options}'
       - integration-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
@@ -444,8 +428,6 @@
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: 'True'
 
 
 - job-template:
@@ -464,26 +446,23 @@
     #####################
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: '{os-cloud}'
+          # CSIT
+          bundle-url: '{bundle-url}'
+          repo-url: '{repo-url}'
+          robot-options: '{robot-options}'
+          # Controller
+          controller-scope: only
+          debug-map: '{debug-map}'
+          install-features: 'odl-jolokia,{install-features}'
+          use-features-boot: 'True'
       - integration-distribution-branch:
           branch: '{verify-branch}'
       - integration-distribution-stream:
           stream: '{verify-stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-url}'
-      - integration-controller-scope:
-          controller-scope: 'only'
-      - integration-controller-features:
-          controller-features: 'odl-jolokia,{install-features}'
-      - integration-test-options:
-          test-options: '{robot-options}'
       - integration-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
@@ -498,8 +477,6 @@
           jdkversion: '{verify-jdkversion}'
       - distribution-karaf-version:
           karaf-version: '{verify-karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: 'True'
 
     scm:
       - integration-gerrit-scm:
@@ -565,28 +542,23 @@
     #####################
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: '{os-cloud}'
+          # CSIT
+          bundle-url: '{bundle-url}'
+          repo-url: '{repo-url}'
+          robot-options: '{robot-options}'
+          # Controller
+          controller-scope: '{scope}'
+          debug-map: '{debug-map}'
+          install-features: 'odl-jolokia,{install-features}'
+          use-features-boot: 'True'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-url}'
-      - integration-controller-scope:
-          controller-scope: '{scope}'
-      - integration-controller-features:
-          controller-features: 'odl-jolokia,{install-features}'
-      - integration-controller-debug-map:
-          controller-debug-map: '{debug-map}'
-      - integration-test-options:
-          test-options: '{robot-options}'
       - integration-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
@@ -603,8 +575,6 @@
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: 'True'
 
     scm:
       - integration-gerrit-scm:
@@ -805,28 +775,23 @@
     <<: *inttest_csit_3node
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: '{os-cloud}'
+          # CSIT
+          bundle-url: '{bundle-url}'
+          repo-url: '{repo-url}'
+          robot-options: '{robot-options}'
+          # Controller
+          controller-scope: '{scope}'
+          debug-map: '{debug-map}'
+          install-features: 'odl-jolokia,{install-features}'
+          use-features-boot: 'True'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-url}'
-      - integration-controller-scope:
-          controller-scope: '{scope}'
-      - integration-controller-features:
-          controller-features: 'odl-jolokia,{install-features}'
-      - integration-controller-debug-map:
-          controller-debug-map: '{debug-map}'
-      - integration-test-options:
-          test-options: '{robot-options}'
       - integration-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
@@ -843,8 +808,6 @@
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: 'True'
 
 
 - job-template:
@@ -863,26 +826,23 @@
     #####################
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: '{os-cloud}'
+          # CSIT
+          bundle-url: '{bundle-url}'
+          repo-url: '{repo-url}'
+          robot-options: '{robot-options}'
+          # Controller
+          controller-scope: '{scope}'
+          debug-map: '{debug-map}'
+          install-features: 'odl-jolokia,{install-features}'
+          use-features-boot: 'True'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-url}'
-      - integration-controller-scope:
-          controller-scope: '{scope}'
-      - integration-controller-features:
-          controller-features: 'odl-jolokia,{install-features}'
-      - integration-test-options:
-          test-options: '{robot-options}'
       - integration-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
@@ -897,8 +857,6 @@
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: 'True'
 
     scm:
       - integration-gerrit-scm:
@@ -986,26 +944,23 @@
     #####################
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: '{os-cloud}'
+          # CSIT
+          bundle-url: '{bundle-url}'
+          repo-url: '{repo-url}'
+          robot-options: '{robot-options}'
+          # Controller
+          controller-scope: ''
+          debug-map: '{debug-map}'
+          install-features: '{install-features}'
+          use-features-boot: '{use-features-boot}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-url}'
-      - integration-controller-features:
-          controller-features: '{install-features}'
-      - integration-controller-debug-map:
-          controller-debug-map: '{debug-map}'
-      - integration-test-options:
-          test-options: '{robot-options}'
       - integration-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
@@ -1020,8 +975,6 @@
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: '{use-features-boot}'
       - string:
           name: OPENSTACK_BRANCH
           default: '{openstack-branch}'
@@ -1203,26 +1156,23 @@
     <<: *inttest_csit_hwvtep_openstack
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: '{os-cloud}'
+          # CSIT
+          bundle-url: '{bundle-url}'
+          repo-url: '{repo-url}'
+          robot-options: '{robot-options}'
+          # Controller
+          controller-scope: ''
+          debug-map: '{debug-map}'
+          install-features: '{install-features}'
+          use-features-boot: '{use-features-boot}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-url}'
-      - integration-controller-features:
-          controller-features: '{install-features}'
-      - integration-controller-debug-map:
-          controller-debug-map: '{debug-map}'
-      - integration-test-options:
-          test-options: '{robot-options}'
       - integration-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
@@ -1237,8 +1187,6 @@
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: '{use-features-boot}'
       - string:
           name: OPENSTACK_BRANCH
           default: '{openstack-branch}'
@@ -1374,26 +1322,23 @@
     #####################
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: '{os-cloud}'
+          # CSIT
+          bundle-url: '{bundle-url}'
+          repo-url: '{repo-url}'
+          robot-options: '{robot-options}'
+          # Controller
+          controller-scope: ''
+          debug-map: '{debug-map}'
+          install-features: '{install-features}'
+          use-features-boot: '{use-features-boot}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-url}'
-      - integration-controller-features:
-          controller-features: '{install-features}'
-      - integration-controller-debug-map:
-          controller-debug-map: '{debug-map}'
-      - integration-test-options:
-          test-options: '{robot-options}'
       - integration-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
@@ -1408,8 +1353,6 @@
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: '{use-features-boot}'
       - string:
           name: OPENSTACK_BRANCH
           default: '{openstack-branch}'
@@ -1595,26 +1538,23 @@
     <<: *inttest_csit_openstack
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: '{os-cloud}'
+          # CSIT
+          bundle-url: '{bundle-url}'
+          repo-url: '{repo-url}'
+          robot-options: '{robot-options}'
+          # Controller
+          controller-scope: ''
+          debug-map: '{debug-map}'
+          install-features: '{install-features}'
+          use-features-boot: '{use-features-boot}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-url}'
-      - integration-controller-features:
-          controller-features: '{install-features}'
-      - integration-controller-debug-map:
-          controller-debug-map: '{debug-map}'
-      - integration-test-options:
-          test-options: '{robot-options}'
       - integration-script-plan:
           script-plan: '{project}.txt'
       - integration-config-plan:
@@ -1629,8 +1569,6 @@
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: '{use-features-boot}'
       - string:
           name: OPENSTACK_BRANCH
           default: '{openstack-branch}'
@@ -1881,26 +1819,23 @@
     #####################
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: '{os-cloud}'
+          # CSIT
+          bundle-url: '{bundle-url}'
+          repo-url: '{repo-url}'
+          robot-options: '{robot-options}'
+          # Controller
+          controller-scope: ''
+          debug-map: '{debug-map}'
+          install-features: '{install-features}'
+          use-features-boot: '{use-features-boot}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-url}'
-      - integration-controller-features:
-          controller-features: '{install-features}'
-      - integration-controller-debug-map:
-          controller-debug-map: '{debug-map}'
-      - integration-test-options:
-          test-options: '{robot-options}'
       - integration-test-plan:
           test-plan: '{project}-{functionality}.txt'
       - integration-test-suites:
@@ -1911,8 +1846,6 @@
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: '{use-features-boot}'
       - string:
           name: OPENSTACK_BRANCH
           default: '{openstack-branch}'
@@ -2003,26 +1936,23 @@
     <<: *inttest_csit_apex
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
+      - integration-csit-parameters:
+          archive-artifacts: '{archive-artifacts}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          os-cloud: '{os-cloud}'
+          # CSIT
+          bundle-url: '{bundle-url}'
+          repo-url: '{repo-url}'
+          robot-options: '{robot-options}'
+          # Controller
+          controller-scope: ''
+          debug-map: '{debug-map}'
+          install-features: '{install-features}'
+          use-features-boot: '{use-features-boot}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-distribution-stream:
           stream: '{stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-repo-url:
-          repo-url: '{repo-url}'
-      - integration-controller-features:
-          controller-features: '{install-features}'
-      - integration-controller-debug-map:
-          controller-debug-map: '{debug-map}'
-      - integration-test-options:
-          test-options: '{robot-options}'
       - integration-test-plan:
           test-plan: '{testplan}'
       - integration-test-suites:
@@ -2033,8 +1963,6 @@
           jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: '{use-features-boot}'
       - string:
           name: OPENSTACK_BRANCH
           default: '{openstack-branch}'