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
Remove unused ODL_L3 from local.conf
[releng/builder.git]
/
jjb
/
integration
/
integration-templates.yaml
diff --git
a/jjb/integration/integration-templates.yaml
b/jjb/integration/integration-templates.yaml
index debea613157ad3c9373f4bfb14bc5bb8040260c4..7ad19c5e7afeb6a599b515bae9ac6b5fb7d1657f 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:
@@
-156,6
+160,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-stream-test-plan:
stream-test-plan: '{streamtestplan}'
- integration-test-plan:
- integration-stream-test-plan:
stream-test-plan: '{streamtestplan}'
- integration-test-plan:
@@
-392,6
+400,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,6
+502,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-stream-test-plan:
stream-test-plan: '{streamtestplan}'
- integration-test-plan:
- integration-stream-test-plan:
stream-test-plan: '{streamtestplan}'
- integration-test-plan:
@@
-722,6
+738,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
+828,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
@@
-894,10
+915,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}'
@@
-1025,8
+1042,8
@@
- lf-infra-publish
- job-template:
- lf-infra-publish
- job-template:
- name: '{prefix}{project}-csit-{topology}-
- {os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-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
@@
-1112,10
+1129,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}'