Revert testplan change and add custom csit types 12/77712/1
authorThanh Ha <thanh.ha@linuxfoundation.org>
Tue, 13 Nov 2018 09:22:10 +0000 (17:22 +0800)
committerThanh Ha <thanh.ha@linuxfoundation.org>
Tue, 13 Nov 2018 09:47:18 +0000 (17:47 +0800)
Revert testplan change caused by
Iddb9da21f490670255f93f8aa730063027a668b8 and add a custom
csit template to allow projects to override testplan at the
project level.

Nesting variables in this file like what was done for testplan
caused every template in releng/builder to require all of
the same variables as CSIT jobs which is a problem because
a job-template that doesn't care about certain variables should
not be required to suddenly require them.

Change-Id: I895b6a41276a5a9434649948e9332f31ae9d3676
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
jjb/defaults.yaml
jjb/genius/genius-csit-genius.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
jjb/integration/integration-templates.yaml
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-apex.yaml
jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/odltools/odltools-csit.yaml

index 33db2f6ce3b8a088bf920b8bc35674c889a932aa..632fb631fb789de7f1a9d763ef42220ed97243b3 100644 (file)
@@ -3,11 +3,8 @@
 
 - defaults:
     name: global
-    functionality: global
-    stream: global
     prefix: ''  # A prefix for job names sandbox for example: user-
 
-    testplan: '{project}-{functionality}.txt'
     karaf-version: karaf4
     build-days-to-keep: 30
     use-features-boot: 'True'
index 3986e83cc3720ed5767ec180629320bb263c2159..46315bb4b09d9bdde34ed71345342177d91a1428 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: genius-csit-genius-oxygen-fluorine
     jobs:
-      - inttest-csit-1node
-      - inttest-csit-3node
+      - inttest-csit-1node-custom
+      - inttest-csit-3node-custom
 
     project: 'genius'
 
@@ -13,6 +13,8 @@
       - 'tdd-wip':
           testplan: '{project}-tdd-wip.txt'
 
+    testplan: '{project}-{functionality}.txt'
+
     stream:
       - neon:
           branch: 'master'
index 6b33561b93d8f4454f90d24cf641402fe58cd379..732faf41eecfd4210190392bb47318bfba7dbefd 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: groupbasedpolicy-csit-openstack-integration
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     # The project name
     project: 'groupbasedpolicy'
index 88b4c8004569352fd564ad7a26ac07abd79d66dd..0605320d42a08e9130da4cc81162e1c2e598b33b 100644 (file)
       - releng-openstack-stack-delete
       - lf-infra-publish
 
-- job-template:
-    name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}'
-    id: inttest-csit-1node
+
+######################
+# inttest-csit-1node #
+######################
+
+- inttest_csit_1node: &inttest_csit_1node
+    name: inttest-csit-1node
+
+    #####################
+    # Default variables #
+    #####################
+
     disable-job: false
-    disabled: '{disable-job}'
+
+    #####################
+    # Job configuration #
+    #####################
 
     project-type: freestyle
     node: centos7-robot-2c-8g
+    concurrent: true
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
       - integration-stream-test-plan:
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
-          test-plan: '{testplan}'
+          test-plan: '{project}-{functionality}.txt'
       - integration-test-suites:
           test-suites: '{test-suites}'
       - integration-patch-refspec:
       - releng-openstack-stack-delete
       - lf-infra-publish
 
+- job-template:
+    name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}'
+    id: inttest-csit-1node
+    <<: *inttest_csit_1node
+
+- job-template:
+    name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}'
+    id: inttest-csit-1node-custom
+    <<: *inttest_csit_1node
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: 'integration/test'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - 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:
+          config-plan: '{project}.txt'
+      - integration-stream-test-plan:
+          stream-test-plan: '{project}-{functionality}-{stream}.txt'
+      - integration-test-plan:
+          test-plan: '{testplan}'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
+      - integration-patch-refspec:
+          branch: 'master'
+      - integration-jdk-version:
+          jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: 'True'
+
+
 - job-template:
     name: '{prefix}{project}-csit-verify-3node-{functionality}'
     id: inttest-csit-verify-3node
       - releng-openstack-stack-delete
       - lf-infra-publish
 
-- job-template:
-    name: '{prefix}{project}-csit-3node-{functionality}-{install}-{stream}'
-    id: inttest-csit-3node
-    disabled: false
+
+######################
+# inttest-csit-3node #
+######################
+
+- inttest_csit_3node: &inttest_csit_3node
+    name: inttest-csit-3node
+
+    #####################
+    # Default variables #
+    #####################
+
+    disable-job: false
+
+    #####################
+    # Job configuration #
+    #####################
 
     project-type: freestyle
     node: centos7-robot-2c-8g
+    concurrent: true
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
       - integration-stream-test-plan:
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
-          test-plan: '{testplan}'
+          test-plan: '{project}-{functionality}.txt'
       - integration-test-suites:
           test-suites: '{test-suites}'
       - integration-patch-refspec:
       - releng-openstack-stack-delete
       - lf-infra-publish
 
+- job-template:
+    name: '{prefix}{project}-csit-3node-{functionality}-{install}-{stream}'
+    id: inttest-csit-3node
+    <<: *inttest_csit_3node
+
+- job-template:
+    name: '{prefix}{project}-csit-3node-{functionality}-{install}-{stream}'
+    id: inttest-csit-3node-custom
+    <<: *inttest_csit_3node
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: 'integration/test'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - 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:
+          config-plan: '{project}.txt'
+      - integration-stream-test-plan:
+          stream-test-plan: '{project}-{functionality}-{stream}.txt'
+      - integration-test-plan:
+          test-plan: '{testplan}'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
+      - integration-patch-refspec:
+          branch: 'master'
+      - integration-jdk-version:
+          jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: 'True'
+
+
 - job-template:
     name: '{prefix}{project}-csit-3node-docker-{functionality}-{install}-{stream}'
     id: inttest-csit-3node-docker
       - releng-openstack-stack-delete
       - lf-infra-publish
 
-- job-template:
-    # yamllint disable-line rule:line-length
-    name: '{prefix}{project}-csit-hwvtep-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}'
-    id: inttest-csit-hwvtep-openstack
-    disabled: false
+
+#################################
+# inttest-csit-hwvtep-openstack #
+#################################
+
+- inttest_csit_hwvtep_openstack: &inttest_csit_hwvtep_openstack
+    name: inttest-csit-hwvtep-openstack
+
+    #####################
+    # Default variables #
+    #####################
+
+    disable-job: false
+
+    #####################
+    # Job configuration #
+    #####################
 
     project-type: freestyle
     node: centos7-robot-2c-8g
     concurrent: true
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
       - integration-config-plan:
           config-plan: '{project}.txt'
       - integration-test-plan:
-          test-plan: '{testplan}'
+          test-plan: '{project}-{functionality}.txt'
       - integration-test-suites:
           test-suites: '{test-suites}'
       - integration-patch-refspec:
           default: '{ovs-install}'
           description: 'Install a custom OVS. It can be an OVS version to build (like v2.9.2 or v2.6.1-nsh) or a yum
           repo url to pull from.'
+
     scm:
       - integration-gerrit-scm:
           basedir: 'test'
 
 - job-template:
     # yamllint disable-line rule:line-length
-    name: '{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}'
-    id: inttest-csit-openstack
-    disabled: false
-
-    project-type: freestyle
-    node: centos7-robot-2c-8g
-    concurrent: true
+    name: '{prefix}{project}-csit-hwvtep-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}'
+    id: inttest-csit-hwvtep-openstack
+    <<: *inttest_csit_hwvtep_openstack
 
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+- job-template:
+    # yamllint disable-line rule:line-length
+    name: '{prefix}{project}-csit-hwvtep-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}'
+    id: inttest-csit-hwvtep-openstack-custom
+    <<: *inttest_csit_hwvtep_openstack
 
     parameters:
       - opendaylight-infra-parameters:
           default: '{odl-ml2-port-binding}'
           description: 'Method of networking-odl port-binding (pseudo-agentdb-binding or legacy-port-binding or
           network-topology)'
-      - string:
-          name: ENABLE_GRE_TYPE_DRIVERS
-          default: '{enable-gre-type-driver}'
-          description: 'Enable gre tunnel'
       - string:
           name: DEVSTACK_KUBERNETES_PLUGIN_REPO
           default: '{devstack-kubernetes-plugin-repo}'
       - string:
           name: ENABLE_OS_SERVICES
           default: '{enable-openstack-services}'
-          description: 'comma seperated list of services to enable'
+          description: 'comma separated list of services to enable on controller nodes'
       - string:
           name: ENABLE_OS_COMPUTE_SERVICES
           default: '{enable-openstack-compute-services}'
           default: '{ovs-install}'
           description: 'Install a custom OVS. It can be an OVS version to build (like v2.9.2 or v2.6.1-nsh) or a yum
           repo url to pull from.'
-    scm:
-      - integration-gerrit-scm:
-          basedir: 'test'
-          refspec: '$PATCHREFSPEC'
-          branch: 'master'
 
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
 
-    triggers:
-      - timed: '{schedule}'
+##########################
+# inttest-csit-openstack #
+##########################
 
-    builders:
-      - lf-infra-pre-build
-      - integration-infra-stack-4-type:
-          stack-template: '{stack-template}'
-          vm_0_count: '{odl_system_count}'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{openstack_system_count}'
-          vm_1_flavor: '{openstack_system_flavor}'
-          vm_1_image: '{openstack_system_image}'
-          vm_2_count: '{openstack_system2_count}'
-          vm_2_flavor: '{openstack_system2_flavor}'
-          vm_2_image: '{openstack_system2_image}'
-          vm_3_count: '{tools_system_count}'
-          vm_3_flavor: '{tools_system_flavor}'
-          vm_3_image: '{tools_system_image}'
-      - integration-install-robotframework
-      - inject:
-          properties-file: 'env.properties'
-      - integration-get-slave-addresses
-      - inject:
-          properties-file: 'slave_addresses.txt'
-      - integration-detect-variables
-      - integration-install-common-functions
-      - integration-deploy-controller-run-test
-      - integration-deploy-openstack-run-test
-      - integration-cleanup-tmp
+- inttest_csit_openstack: &inttest_csit_openstack
+    name: inttest-csit-openstack
 
-    publishers:
-      - integration-robot-tempest:
-          unstable-if: 0.0
-          pass-if: 100.0
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project}]'
-      - integration-csit-collect-netvirt-logs
-      - integration-csit-archive-build
-      - integration-csit-run-postscript
-      - releng-openstack-stack-delete
-      - lf-infra-publish
+    #####################
+    # Default variables #
+    #####################
 
-# Template: {project}-patch-test-{stream}
-# Goal: Build a patch and run project specific system test on a distribution containing the change
-# Operation: This job template builds a patch, creates a distribution containing the patch, and
-# triggers the project system test defined in {csit-list} when gerrit receives test-{project} keyword
+    disable-job: false
 
-- job-template:
-    name: '{prefix}{project}-patch-test-{feature}-{stream}'
-    id: inttest-patch-test
+    #####################
+    # Job configuration #
+    #####################
 
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-robot-2c-8g
     concurrent: true
-    jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
     parameters:
       - opendaylight-infra-parameters:
           os-cloud: '{os-cloud}'
-          project: '{project}'
+          project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - 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:
+          config-plan: '{project}.txt'
+      - integration-test-plan:
+          test-plan: '{project}-{functionality}.txt'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
+      - integration-patch-refspec:
+          branch: 'master'
+      - integration-jdk-version:
+          jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
-      - integration-distribution-git-url:
-          git-url: '{git-url}'
+      - integration-use-features-boot:
+          use-features-boot: '{use-features-boot}'
       - string:
-          name: feature
-          default: 'all'
+          name: OPENSTACK_BRANCH
+          default: '{openstack-branch}'
+          description: 'Openstack version to use with devstack'
+      - string:
+          name: DEVSTACK_HASH
+          default: '{devstack-hash}'
+          description: 'devstack hash to checkout'
+      - string:
+          name: ODL_ML2_DRIVER_REPO
+          default: '{odl-ml2-driver-repo}'
+          description: 'URL to fetch networking-odl driver'
+      - string:
+          name: ODL_ML2_BRANCH
+          default: '{odl-ml2-branch}'
+          description: 'Version of networking-odl to checkout from the repo'
+      - string:
+          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: ENABLE_GRE_TYPE_DRIVERS
+          default: '{enable-gre-type-driver}'
+          description: 'Enable gre tunnel'
+      - 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: 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}'
+          description: 'Specifies public bridge for provider and external networking'
+      - string:
+          name: ENABLE_HAPROXY_FOR_NEUTRON
+          default: '{enable-haproxy}'
+          description: 'Enable HAProxy for using neutron interface as HA'
+      - string:
+          name: ENABLE_OS_SERVICES
+          default: '{enable-openstack-services}'
+          description: 'comma seperated list of services to enable'
+      - string:
+          name: ENABLE_OS_COMPUTE_SERVICES
+          default: '{enable-openstack-compute-services}'
+          description: 'comma separated list of services to enable on compute nodes'
+      - string:
+          name: ENABLE_OS_NETWORK_SERVICES
+          default: '{enable-openstack-network-services}'
+          description: 'comma seperated list of network 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}'
+          description: 'comma seperated list of services to enable'
+      - string:
+          name: TENANT_NETWORK_TYPE
+          default: '{tenant-network-type}'
+          description: 'Tenant Network Type supported by the implementation'
+      - string:
+          name: SECURITY_GROUP_MODE
+          default: '{security-group-mode}'
+          description: 'Security Group Mode to be used in netvirt aclservice config'
+      - string:
+          name: ENABLE_ITM_DIRECT_TUNNELS
+          default: '{enable-itm-direct-tunnels}'
+          description: 'Tunnel Configuration mode to be used in genius ifm config'
+      - string:
+          name: PUBLIC_PHYSICAL_NETWORK
+          default: '{public-physical-network}'
+          description: 'provider physical network used for flat/vlan networks'
+      - string:
+          name: ENABLE_NETWORKING_L2GW
+          default: '{enable-networking-l2gw}'
+          description: 'Enable networking L2gw'
+      - string:
+          name: NETWORKING_L2GW_DRIVER
+          default: '{networking-l2gw-repo}'
+          description: 'URL to fetch networking-l2gw driver'
+      - string:
+          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: ODL_SFC_DRIVER
+          default: '{odl-sfc-driver}'
+          description: 'The SFC driver to be used in local.conf - only relevant when using networking-sfc'
+      - string:
+          name: ODL_SNAT_MODE
+          default: '{odl-snat-mode}'
+          description: 'The SNAT mode to be configured - options are conntrack/controller.'
+      - string:
+          name: OVS_INSTALL
+          default: '{ovs-install}'
+          description: 'Install a custom OVS. It can be an OVS version to build (like v2.9.2 or v2.6.1-nsh) or a yum
+          repo url to pull from.'
+
+    scm:
+      - integration-gerrit-scm:
+          basedir: 'test'
+          refspec: '$PATCHREFSPEC'
+          branch: 'master'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - timed: '{schedule}'
+
+    builders:
+      - lf-infra-pre-build
+      - integration-infra-stack-4-type:
+          stack-template: '{stack-template}'
+          vm_0_count: '{odl_system_count}'
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{openstack_system_count}'
+          vm_1_flavor: '{openstack_system_flavor}'
+          vm_1_image: '{openstack_system_image}'
+          vm_2_count: '{openstack_system2_count}'
+          vm_2_flavor: '{openstack_system2_flavor}'
+          vm_2_image: '{openstack_system2_image}'
+          vm_3_count: '{tools_system_count}'
+          vm_3_flavor: '{tools_system_flavor}'
+          vm_3_image: '{tools_system_image}'
+      - integration-install-robotframework
+      - inject:
+          properties-file: 'env.properties'
+      - integration-get-slave-addresses
+      - inject:
+          properties-file: 'slave_addresses.txt'
+      - integration-detect-variables
+      - integration-install-common-functions
+      - integration-deploy-controller-run-test
+      - integration-deploy-openstack-run-test
+      - integration-cleanup-tmp
+
+    publishers:
+      - integration-robot-tempest:
+          unstable-if: 0.0
+          pass-if: 100.0
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project}]'
+      - integration-csit-collect-netvirt-logs
+      - integration-csit-archive-build
+      - integration-csit-run-postscript
+      - releng-openstack-stack-delete
+      - lf-infra-publish
+
+- job-template:
+    # yamllint disable-line rule:line-length
+    name: '{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}'
+    id: inttest-csit-openstack
+    <<: *inttest_csit_openstack
+
+- job-template:
+    # yamllint disable-line rule:line-length
+    name: '{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}'
+    id: inttest-csit-openstack-custom
+    <<: *inttest_csit_openstack
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: 'integration/test'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - 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:
+          config-plan: '{project}.txt'
+      - integration-test-plan:
+          test-plan: '{testplan}'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
+      - integration-patch-refspec:
+          branch: 'master'
+      - integration-jdk-version:
+          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}'
+          description: 'Openstack version to use with devstack'
+      - string:
+          name: DEVSTACK_HASH
+          default: '{devstack-hash}'
+          description: 'devstack hash to checkout'
+      - string:
+          name: ODL_ML2_DRIVER_REPO
+          default: '{odl-ml2-driver-repo}'
+          description: 'URL to fetch networking-odl driver'
+      - string:
+          name: ODL_ML2_BRANCH
+          default: '{odl-ml2-branch}'
+          description: 'Version of networking-odl to checkout from the repo'
+      - string:
+          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: ENABLE_GRE_TYPE_DRIVERS
+          default: '{enable-gre-type-driver}'
+          description: 'Enable gre tunnel'
+      - 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: 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}'
+          description: 'Specifies public bridge for provider and external networking'
+      - string:
+          name: ENABLE_HAPROXY_FOR_NEUTRON
+          default: '{enable-haproxy}'
+          description: 'Enable HAProxy for using neutron interface as HA'
+      - string:
+          name: ENABLE_OS_SERVICES
+          default: '{enable-openstack-services}'
+          description: 'comma seperated list of services to enable'
+      - string:
+          name: ENABLE_OS_COMPUTE_SERVICES
+          default: '{enable-openstack-compute-services}'
+          description: 'comma separated list of services to enable on compute nodes'
+      - string:
+          name: ENABLE_OS_NETWORK_SERVICES
+          default: '{enable-openstack-network-services}'
+          description: 'comma seperated list of network 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}'
+          description: 'comma seperated list of services to enable'
+      - string:
+          name: TENANT_NETWORK_TYPE
+          default: '{tenant-network-type}'
+          description: 'Tenant Network Type supported by the implementation'
+      - string:
+          name: SECURITY_GROUP_MODE
+          default: '{security-group-mode}'
+          description: 'Security Group Mode to be used in netvirt aclservice config'
+      - string:
+          name: ENABLE_ITM_DIRECT_TUNNELS
+          default: '{enable-itm-direct-tunnels}'
+          description: 'Tunnel Configuration mode to be used in genius ifm config'
+      - string:
+          name: PUBLIC_PHYSICAL_NETWORK
+          default: '{public-physical-network}'
+          description: 'provider physical network used for flat/vlan networks'
+      - string:
+          name: ENABLE_NETWORKING_L2GW
+          default: '{enable-networking-l2gw}'
+          description: 'Enable networking L2gw'
+      - string:
+          name: NETWORKING_L2GW_DRIVER
+          default: '{networking-l2gw-repo}'
+          description: 'URL to fetch networking-l2gw driver'
+      - string:
+          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: ODL_SFC_DRIVER
+          default: '{odl-sfc-driver}'
+          description: 'The SFC driver to be used in local.conf - only relevant when using networking-sfc'
+      - string:
+          name: ODL_SNAT_MODE
+          default: '{odl-snat-mode}'
+          description: 'The SNAT mode to be configured - options are conntrack/controller.'
+      - string:
+          name: OVS_INSTALL
+          default: '{ovs-install}'
+          description: 'Install a custom OVS. It can be an OVS version to build (like v2.9.2 or v2.6.1-nsh) or a yum
+          repo url to pull from.'
+
+# Template: {project}-patch-test-{stream}
+# Goal: Build a patch and run project specific system test on a distribution containing the change
+# Operation: This job template builds a patch, creates a distribution containing the patch, and
+# triggers the project system test defined in {csit-list} when gerrit receives test-{project} keyword
+
+- job-template:
+    name: '{prefix}{project}-patch-test-{feature}-{stream}'
+    id: inttest-patch-test
+
+    project-type: freestyle
+    node: centos7-builder-2c-8g
+    concurrent: true
+    jdk: '{java-version}'
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - integration-distribution-branch:
+          branch: '{branch}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
+      - integration-distribution-git-url:
+          git-url: '{git-url}'
+      - string:
+          name: feature
+          default: 'all'
           description: 'Specific feature test for patch'
       - maven-exec:
           maven-version: mvn35
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
 
-- job-template:
-    # yamllint disable-line rule:line-length
-    name: '{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-apex-{openstack}-{functionality}-{stream}'
-    id: inttest-csit-apex
-    disabled: false
+
+#####################
+# inttest-csit-apex #
+#####################
+
+- inttest_csit_apex: &inttest_csit_apex
+    name: inttest-csit-apex
+
+    #####################
+    # Default variables #
+    #####################
+
+    disable-job: false
+
+    #####################
+    # Job configuration #
+    #####################
 
     project-type: freestyle
     node: centos7-robot-2c-8g
     concurrent: true
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-test-plan:
-          test-plan: '{testplan}'
+          test-plan: '{project}-{functionality}.txt'
       - integration-test-suites:
           test-suites: '{test-suites}'
       - integration-patch-refspec:
       - integration-csit-run-postscript
       - releng-openstack-stack-delete
       - lf-infra-publish
+
+- job-template:
+    # yamllint disable-line rule:line-length
+    name: '{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-apex-{openstack}-{functionality}-{stream}'
+    id: inttest-csit-apex
+    <<: *inttest_csit_apex
+
+- job-template:
+    # yamllint disable-line rule:line-length
+    name: '{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-apex-{openstack}-{functionality}-{stream}'
+    id: inttest-csit-apex-custom
+    <<: *inttest_csit_apex
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: 'integration/test'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - 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:
+          test-suites: '{test-suites}'
+      - integration-patch-refspec:
+          branch: 'master'
+      - integration-jdk-version:
+          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}'
+          description: 'Openstack version to use with devstack'
+      - 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}'
+          description: 'Specifies public bridge for provider and external networking'
+      - string:
+          name: SECURITY_GROUP_MODE
+          default: '{security-group-mode}'
+          description: 'Security Group Mode to be used in netvirt aclservice config'
+      - string:
+          name: ENABLE_ITM_DIRECT_TUNNELS
+          default: '{enable-itm-direct-tunnels}'
+          description: 'Tunnel Configuration mode to be used in genius ifm config'
+      - string:
+          name: PUBLIC_PHYSICAL_NETWORK
+          default: '{public-physical-network}'
+          description: 'provider physical network used for flat/vlan networks'
+      - string:
+          name: ODL_SNAT_MODE
+          default: '{odl-snat-mode}'
+          description: 'The SNAT mode to be configured - options are conntrack/controller.'
index 934f43578de03cb0dd7cac0735f7ecec85e118af..508dec3bb80060092f9ae60e3f6a7b54b52573e4 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-neon
     jobs:
-      - inttest-csit-hwvtep-openstack
+      - inttest-csit-hwvtep-openstack-custom
 
     project: 'netvirt'
     stream: 'neon'
@@ -51,7 +51,7 @@
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-fluorine
     jobs:
-      - inttest-csit-hwvtep-openstack
+      - inttest-csit-hwvtep-openstack-custom
 
     project: 'netvirt'
     stream: 'fluorine'
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-oxygen
     jobs:
-      - inttest-csit-hwvtep-openstack
+      - inttest-csit-hwvtep-openstack-custom
 
     project: 'netvirt'
     stream: 'oxygen'
index e43dae519e3d4e2be20c5689e04e07d262086451..9647cc22f8b64797498eb80d70600d4d60690d9d 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netvirt-csit-apex-integration-oxygen
     jobs:
-      - inttest-csit-apex
+      - inttest-csit-apex-custom
 
     project: 'netvirt'
     stream:
index e6364a413785a06de4d6e9d82851fc7accbdcba2..d4a244d316f531c1d484f453a04aa2bb4ce8ddaa 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netvirt-csit-upgrade-openstack-integration
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     project: 'netvirt'
 
index 69be4f84a6c3c56de73422e80349ad8b17d0ce64..4548ca50c7494ec24774d652cf44f12cedeb219f 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netvirt-csit-openstack-integration-neon
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     project: 'netvirt'
     stream: 'neon'
@@ -79,7 +79,7 @@
 - project:
     name: netvirt-csit-openstack-integration-fluorine
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     project: 'netvirt'
     stream: 'fluorine'
 - project:
     name: netvirt-csit-openstack-integration-oxygen
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     project: 'netvirt'
     stream: 'oxygen'
 - project:
     name: netvirt-csit-sfc-openstack-integration
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     project: 'netvirt'
     security-group-mode: 'stateful'
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     project: 'netvirt'
     testplan: '{project}-{topology}-openstack.txt'
index ec2c33f4ee48acaf79ec8cafa9e4b054eb1cfc78..4c848fa5893e87ce7237b52382513cddd213105f 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: odltools-csit
     jobs:
-      - inttest-csit-1node
+      - inttest-csit-1node-custom
       - inttest-csit-verify-1node
 
     project: odltools