Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "enable driver_type gre and ml2_gre"
[releng/builder.git]
/
jjb
/
integration
/
integration-templates.yaml
diff --git
a/jjb/integration/integration-templates.yaml
b/jjb/integration/integration-templates.yaml
index 74fb386fa2dc30dac9b4680a34da99533b9d0192..e68d44d1e325df48d8ecb29b6418f8cd49988be1 100644
(file)
--- 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}'
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:
- integration-stream-test-plan:
stream-test-plan: '{project}-{functionality}-{verify-stream}.txt'
- integration-test-plan:
@@
-124,7
+128,8
@@
- job-template:
name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}'
id: inttest-csit-1node
- 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
project-type: freestyle
node: centos7-robot-2c-8g
@@
-156,10
+161,14
@@
controller-debug-map: '{debug-map}'
- integration-test-options:
test-options: '{robot-options}'
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:
- integration-stream-test-plan:
- stream-test-plan: '{
project}-{functionality}-{stream}.txt
'
+ stream-test-plan: '{
streamtestplan}
'
- integration-test-plan:
- integration-test-plan:
- test-plan: '{
project}-{functionality}.txt
'
+ test-plan: '{
testplan}
'
- integration-test-suites:
test-suites: '{test-suites}'
- integration-patch-refspec:
- integration-test-suites:
test-suites: '{test-suites}'
- integration-patch-refspec:
@@
-392,6
+401,10
@@
controller-features: 'odl-jolokia,{install-features}'
- integration-test-options:
test-options: '{robot-options}'
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:
- integration-stream-test-plan:
stream-test-plan: '{project}-{functionality}-{verify-stream}.txt'
- integration-test-plan:
@@
-490,10
+503,14
@@
controller-debug-map: '{debug-map}'
- integration-test-options:
test-options: '{robot-options}'
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:
- integration-stream-test-plan:
- stream-test-plan: '{
project}-{functionality}-{stream}.txt
'
+ stream-test-plan: '{
streamtestplan}
'
- integration-test-plan:
- integration-test-plan:
- test-plan: '{
project}-{functionality}.txt
'
+ test-plan: '{
testplan}
'
- integration-test-suites:
test-suites: '{test-suites}'
- integration-patch-refspec:
- integration-test-suites:
test-suites: '{test-suites}'
- integration-patch-refspec:
@@
-722,6
+739,10
@@
controller-features: 'odl-jolokia,{install-features}'
- integration-test-options:
test-options: '{robot-options}'
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:
- integration-stream-test-plan:
stream-test-plan: '{project}-{functionality}-{stream}.txt'
- integration-test-plan:
@@
-808,7
+829,8
@@
- lf-infra-publish
- job-template:
- 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
id: inttest-csit-hwvtep-openstack
disabled: false
@@
-841,6
+863,10
@@
controller-debug-map: '{debug-map}'
- integration-test-options:
test-options: '{robot-options}'
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:
- integration-test-plan:
test-plan: '{testplan}'
- integration-test-suites:
@@
-890,10
+916,6
@@
name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO
default: '{devstack-networking-sfc-plugin-repo}'
description: 'URL to fetch neutron-lbaas devstack plugin'
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}'
- string:
name: IPSEC_VXLAN_TUNNELS_ENABLED
default: '{ipsec-vxlan-tunnels-enabled}'
@@
-934,6
+956,10
@@
name: SECURITY_GROUP_MODE
default: '{security-group-mode}'
description: 'Security Group Mode to be used in netvirt aclservice config'
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}'
- string:
name: PUBLIC_PHYSICAL_NETWORK
default: '{public-physical-network}'
@@
-963,6
+989,11
@@
name: ODL_SNAT_MODE
default: '{odl-snat-mode}'
description: 'The SNAT mode to be configured - options are conntrack/controller.'
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'
scm:
- integration-gerrit-scm:
basedir: 'test'
@@
-1010,13
+1041,15
@@
- email-notification:
email-recipients: '{email-recipients}'
email-prefix: '[{project}]'
- 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:
- 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
id: inttest-csit-openstack
disabled: false
@@
-1049,6
+1082,10
@@
controller-debug-map: '{debug-map}'
- integration-test-options:
test-options: '{robot-options}'
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:
- integration-test-plan:
test-plan: '{testplan}'
- integration-test-suites:
@@
-1086,6
+1123,10
@@
default: '{odl-ml2-port-binding}'
description: 'Method of networking-odl port-binding (pseudo-agentdb-binding or legacy-port-binding or
network-topology)'
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: DEVSTACK_KUBERNETES_PLUGIN_REPO
default: '{devstack-kubernetes-plugin-repo}'
@@
-1098,10
+1139,6
@@
name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO
default: '{devstack-networking-sfc-plugin-repo}'
description: 'URL to fetch neutron-lbaas devstack plugin'
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}'
- string:
name: IPSEC_VXLAN_TUNNELS_ENABLED
default: '{ipsec-vxlan-tunnels-enabled}'
@@
-1142,6
+1179,10
@@
name: SECURITY_GROUP_MODE
default: '{security-group-mode}'
description: 'Security Group Mode to be used in netvirt aclservice config'
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}'
- string:
name: PUBLIC_PHYSICAL_NETWORK
default: '{public-physical-network}'
@@
-1163,10
+1204,6
@@
default: '{lbaas-service-provider}'
description: 'The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf - only relevant when using
neutron-lbaas'
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}'
- string:
name: ODL_SFC_DRIVER
default: '{odl-sfc-driver}'
@@
-1175,7
+1212,11
@@
name: ODL_SNAT_MODE
default: '{odl-snat-mode}'
description: 'The SNAT mode to be configured - options are conntrack/controller.'
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'
scm:
- integration-gerrit-scm:
basedir: 'test'
@@
-1220,6
+1261,7
@@
- email-notification:
email-recipients: '{email-recipients}'
email-prefix: '[{project}]'
- 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
- integration-csit-archive-build
- integration-csit-run-postscript
- releng-openstack-stack-delete