Merge "Replace `` cmd substitution with $()"

[releng/builder.git] / jjb / integration / integration-templates.yaml

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 465418ed6a697476be54fff3e86fd3b079ff90e8..3b46c1324da7c287349a8c1eaa1b357aec95951b 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -39,6 +39,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -122,10 +123,9 @@
       - opendaylight-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
 
-    testplan: '{project}-{functionality}.txt'
-
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -145,7 +145,7 @@
       - integration-stream-test-plan:
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
-          test-plan: '{testplan}'
+          test-plan: '{project}-{functionality}.txt'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
@@ -235,6 +235,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -456,6 +457,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -540,10 +542,9 @@
       - opendaylight-infra-properties:
           build-days-to-keep: '{build-days-to-keep}'
 
-    testplan: '{project}-{functionality}.txt'
-
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -563,7 +564,7 @@
       - integration-stream-test-plan:
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
-          test-plan: '{testplan}'
+          test-plan: '{project}-{functionality}.txt'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
@@ -652,6 +653,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -762,6 +764,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -985,6 +988,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -1021,10 +1025,31 @@
           name: ODL_ML2_DRIVER_VERSION
           default: '{odl-ml2-driver-version}'
           description: 'Mode of networking-odl (v1 or v2)'
+      - string:
+          name: ODL_ML2_PORT_BINDING
+          default: '{odl-ml2-port-binding}'
+          description: 'Method of networking-odl port-binding (pseudo-agentdb-binding or legacy-port-binding or
+          network-topology)'
+      - string:
+          name: DEVSTACK_KUBERNETES_PLUGIN_REPO
+          default: '{devstack-kubernetes-plugin-repo}'
+          description: 'URL to fetch kubernetes devstack plugin'
+      - string:
+          name: DEVSTACK_LBAAS_PLUGIN_REPO
+          default: '{devstack-lbaas-plugin-repo}'
+          description: 'URL to fetch neutron-lbaas devstack plugin'
+      - string:
+          name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO
+          default: '{devstack-networking-sfc-plugin-repo}'
+          description: 'URL to fetch neutron-lbaas devstack plugin'
       - string:
           name: ODL_ENABLE_L3_FWD
           default: '{odl-enable-l3}'
           description: 'Enable L3 FWD in ODL for createing br-ex'
+      - string:
+          name: IPSEC_VXLAN_TUNNELS_ENABLED
+          default: '{ipsec-vxlan-tunnels-enabled}'
+          description: 'Enable ipsec over vxlan support for all controllers and computes'
       - string:
           name: PUBLIC_BRIDGE
           default: '{public-bridge}'
@@ -1037,6 +1062,10 @@
           name: ENABLE_OS_SERVICES
           default: '{enable-openstack-services}'
           description: 'comma seperated list of services to enable'
+      - string:
+          name: ENABLE_OS_PLUGINS
+          default: '{enable-openstack-plugins}'
+          description: 'comma seperated list of plugins to enable'
       - string:
           name: DISABLE_OS_SERVICES
           default: '{disable-openstack-services}'
@@ -1062,9 +1091,14 @@
           default: '{networking-l2gw-repo}'
           description: 'URL to fetch networking-l2gw driver'
       - string:
-          name: DISABLE_ODL_L3_PLUGIN
-          default: '{disable-odl-l3-service-plugin}'
-          description: 'Disable odl l3 service plugin'
+          name: CREATE_INITIAL_NETWORKS
+          default: '{create-initial-networks}'
+          description: 'Toggles the option of letting devstack create initial networks (True/False)'
+      - string:
+          name: LBAAS_SERVICE_PROVIDER
+          default: '{lbaas-service-provider}'
+          description: 'The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf - only relevant when using
+          neutron-lbaas'
     scm:
       - integration-gerrit-scm:
           basedir: 'test'
@@ -1127,6 +1161,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -1163,10 +1198,31 @@
           name: ODL_ML2_DRIVER_VERSION
           default: '{odl-ml2-driver-version}'
           description: 'Mode of networking-odl (v1 or v2)'
+      - string:
+          name: ODL_ML2_PORT_BINDING
+          default: '{odl-ml2-port-binding}'
+          description: 'Method of networking-odl port-binding (pseudo-agentdb-binding or legacy-port-binding or
+          network-topology)'
+      - string:
+          name: DEVSTACK_KUBERNETES_PLUGIN_REPO
+          default: '{devstack-kubernetes-plugin-repo}'
+          description: 'URL to fetch kubernetes devstack plugin'
+      - string:
+          name: DEVSTACK_LBAAS_PLUGIN_REPO
+          default: '{devstack-lbaas-plugin-repo}'
+          description: 'URL to fetch neutron-lbaas devstack plugin'
+      - string:
+          name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO
+          default: '{devstack-networking-sfc-plugin-repo}'
+          description: 'URL to fetch neutron-lbaas devstack plugin'
       - string:
           name: ODL_ENABLE_L3_FWD
           default: '{odl-enable-l3}'
           description: 'Enable L3 FWD in ODL for createing br-ex'
+      - string:
+          name: IPSEC_VXLAN_TUNNELS_ENABLED
+          default: '{ipsec-vxlan-tunnels-enabled}'
+          description: 'Enable ipsec over vxlan support for all controllers and computes'
       - string:
           name: PUBLIC_BRIDGE
           default: '{public-bridge}'
@@ -1179,6 +1235,10 @@
           name: ENABLE_OS_SERVICES
           default: '{enable-openstack-services}'
           description: 'comma seperated list of services to enable'
+      - string:
+          name: ENABLE_OS_PLUGINS
+          default: '{enable-openstack-plugins}'
+          description: 'comma seperated list of plugins to enable'
       - string:
           name: DISABLE_OS_SERVICES
           default: '{disable-openstack-services}'
@@ -1204,9 +1264,18 @@
           default: '{networking-l2gw-repo}'
           description: 'URL to fetch networking-l2gw driver'
       - string:
-          name: DISABLE_ODL_L3_PLUGIN
-          default: '{disable-odl-l3-service-plugin}'
-          description: 'Disable odl l3 service plugin'
+          name: CREATE_INITIAL_NETWORKS
+          default: '{create-initial-networks}'
+          description: 'Toggles the option of letting devstack create initial networks (True/False)'
+      - string:
+          name: LBAAS_SERVICE_PROVIDER
+          default: '{lbaas-service-provider}'
+          description: 'The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf - only relevant when using
+          neutron-lbaas'
+      - string:
+          name: NUM_OPENSTACK_SITES
+          default: '{num-openstack-sites}'
+          description: 'Number of openstack sites'
 
     scm:
       - integration-gerrit-scm:
@@ -1273,6 +1342,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: '$GERRIT_REFSPEC'
@@ -1331,11 +1401,10 @@
           maven-version: 'mvn33'
           pom: '{project}/pom.xml'
           goals: >
-              clean install dependency:tree -V -B -Djenkins
-              -DskipTests
-              -Dcheckstyle.skip=true
-              -Dmaven.javadoc.skip=true
-              -Dmaven.site.skip=true
+              clean install dependency:tree
+              -V -B -Pq
+              -Dgitid.skip=false
+              -Djenkins
               -DgenerateReports=false
               -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
               -Dstream={stream}
@@ -1350,7 +1419,10 @@
       maven-name: 'mvn33'
       root-pom: 'distribution/pom.xml'
       goals: >
-          clean install dependency:tree -V -B -Djenkins
+          clean install dependency:tree
+          -V -B -Pq
+          -Dgitid.skip=false
+          -Djenkins
           -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
       maven-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
       settings: 'integration-settings'