X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=eb5c585c54c6467e3b387b38e2a50d60723897dd;hb=ed0e7cc5072ed37372a73bd952f0fc566fb739f7;hp=74fb386fa2dc30dac9b4680a34da99533b9d0192;hpb=c4f5571795775e56ec9bef76c40247c4c34cd755;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 74fb386fa..eb5c585c5 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -62,6 +62,10 @@ controller-features: '{install-features}' - integration-test-options: test-options: '{robot-options}' + - integration-script-plan: + script-plan: '{scriptplan}' + - integration-config-plan: + config-plan: '{configplan}' - integration-stream-test-plan: stream-test-plan: '{project}-{functionality}-{verify-stream}.txt' - integration-test-plan: @@ -90,6 +94,7 @@ files: 'csit/suites/{project}/**' builders: + - lf-infra-pre-build - integration-infra-stack: stack-template: '{stack-template}' vm_0_count: '1' @@ -124,7 +129,8 @@ - job-template: name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}' id: inttest-csit-1node - disabled: false + disable-job: false + disabled: '{disable-job}' project-type: freestyle node: centos7-robot-2c-8g @@ -156,10 +162,14 @@ controller-debug-map: '{debug-map}' - integration-test-options: test-options: '{robot-options}' + - integration-script-plan: + script-plan: '{scriptplan}' + - integration-config-plan: + config-plan: '{configplan}' - integration-stream-test-plan: - stream-test-plan: '{project}-{functionality}-{stream}.txt' + stream-test-plan: '{streamtestplan}' - integration-test-plan: - test-plan: '{project}-{functionality}.txt' + test-plan: '{testplan}' - integration-test-suites: test-suites: '{test-suites}' - integration-patch-refspec: @@ -187,6 +197,7 @@ build-timeout: '{build-timeout}' builders: + - lf-infra-pre-build - integration-infra-stack: stack-template: '{stack-template}' vm_0_count: '1' @@ -392,6 +403,10 @@ controller-features: 'odl-jolokia,{install-features}' - integration-test-options: test-options: '{robot-options}' + - integration-script-plan: + script-plan: '{scriptplan}' + - integration-config-plan: + config-plan: '{configplan}' - integration-stream-test-plan: stream-test-plan: '{project}-{functionality}-{verify-stream}.txt' - integration-test-plan: @@ -423,6 +438,7 @@ files: 'csit/suites/{project}/**' builders: + - lf-infra-pre-build - integration-infra-stack: stack-template: '{stack-template}' vm_0_count: '3' @@ -490,10 +506,14 @@ controller-debug-map: '{debug-map}' - integration-test-options: test-options: '{robot-options}' + - integration-script-plan: + script-plan: '{scriptplan}' + - integration-config-plan: + config-plan: '{configplan}' - integration-stream-test-plan: - stream-test-plan: '{project}-{functionality}-{stream}.txt' + stream-test-plan: '{streamtestplan}' - integration-test-plan: - test-plan: '{project}-{functionality}.txt' + test-plan: '{testplan}' - integration-test-suites: test-suites: '{test-suites}' - integration-patch-refspec: @@ -511,11 +531,17 @@ refspec: '$PATCHREFSPEC' branch: 'master' + triggers: + # we need this for not SR projects + - integration-csit-trigger: + jobs: '{trigger-jobs}' + wrappers: - opendaylight-infra-wrappers: build-timeout: '{build-timeout}' builders: + - lf-infra-pre-build - integration-infra-stack: stack-template: '{stack-template}' vm_0_count: '3' @@ -722,6 +748,10 @@ controller-features: 'odl-jolokia,{install-features}' - integration-test-options: test-options: '{robot-options}' + - integration-script-plan: + script-plan: '{scriptplan}' + - integration-config-plan: + config-plan: '{configplan}' - integration-stream-test-plan: stream-test-plan: '{project}-{functionality}-{stream}.txt' - integration-test-plan: @@ -746,6 +776,7 @@ build-timeout: '{build-timeout}' builders: + - lf-infra-pre-build - integration-infra-stack: stack-template: '{stack-template}' vm_0_count: '3' @@ -808,7 +839,8 @@ - lf-infra-publish - job-template: - name: '{prefix}{project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}' + # 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 @@ -841,6 +873,10 @@ controller-debug-map: '{debug-map}' - integration-test-options: test-options: '{robot-options}' + - integration-script-plan: + script-plan: '{scriptplan}' + - integration-config-plan: + config-plan: '{configplan}' - integration-test-plan: test-plan: '{testplan}' - integration-test-suites: @@ -890,10 +926,6 @@ 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}' @@ -934,6 +966,10 @@ 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}' @@ -963,6 +999,11 @@ 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' @@ -977,6 +1018,7 @@ - timed: '{schedule}' builders: + - lf-infra-pre-build - integration-infra-stack-4-type: stack-template: '{stack-template}' vm_0_count: '{odl_system_count}' @@ -1010,13 +1052,15 @@ - 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: - name: '{prefix}{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}' + # 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 @@ -1049,6 +1093,10 @@ controller-debug-map: '{debug-map}' - integration-test-options: test-options: '{robot-options}' + - integration-script-plan: + script-plan: '{scriptplan}' + - integration-config-plan: + config-plan: '{configplan}' - integration-test-plan: test-plan: '{testplan}' - integration-test-suites: @@ -1086,6 +1134,10 @@ 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}' @@ -1098,10 +1150,6 @@ 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}' @@ -1142,6 +1190,10 @@ 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}' @@ -1163,10 +1215,6 @@ 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' - string: name: ODL_SFC_DRIVER default: '{odl-sfc-driver}' @@ -1175,7 +1223,11 @@ 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' @@ -1190,6 +1242,7 @@ - timed: '{schedule}' builders: + - lf-infra-pre-build - integration-infra-stack-3-type: stack-template: '{stack-template}' vm_0_count: '{odl_system_count}' @@ -1220,6 +1273,7 @@ - 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 @@ -1345,3 +1399,128 @@ - email-notification: 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 + + project-type: freestyle + node: centos7-robot-2c-8g + concurrent: true + + properties: + - opendaylight-infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + 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.' + + 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-apex-stack-3-type: + stack-template: '{stack-template}' + vm_0_count: '{apex_controller_count}' + vm_0_flavor: '{apex_controller_flavor}' + vm_0_image: '{apex_controller_image}' + vm_1_count: '1' + vm_1_flavor: '{apex_compute_0_flavor}' + vm_1_image: '{apex_compute_0_image}' + vm_2_count: '1' + vm_2_flavor: '{apex_compute_1_flavor}' + vm_2_image: '{apex_compute_1_image}' + - integration-install-robotframework + - integration-detect-variables + - integration-install-common-functions + - inject: + properties-file: 'env.properties' + - integration-get-apex-addresses + - inject: + properties-file: 'slave_addresses.txt' + - integration-apex-run-tests + - 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-archive-build + - integration-csit-run-postscript + - releng-openstack-stack-delete + - lf-infra-publish