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 "Fix deploy job goals to use 'deploy' goal"
[releng/builder.git]
/
jjb
/
integration
/
integration-templates.yaml
diff --git
a/jjb/integration/integration-templates.yaml
b/jjb/integration/integration-templates.yaml
index b69e962ace437ee233fa1445a6256c19eef1a710..c86808f73619f6c90931b1029cbbc9f49ccdd7f6 100644
(file)
--- a/
jjb/integration/integration-templates.yaml
+++ b/
jjb/integration/integration-templates.yaml
@@
-128,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
@@
-828,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
@@
-914,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}'
@@
-991,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'
@@
-1132,10
+1135,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}'
@@
-1201,10
+1200,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}'
@@
-1213,7
+1208,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'