Merge "Use default "ds512M" advance image in older stable branches"
This commit is contained in:
commit
a7c0813446
@ -141,6 +141,7 @@
|
||||
CIRROS_VERSION: 0.3.5
|
||||
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
|
||||
TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin
|
||||
ADVANCED_INSTANCE_TYPE: ds512M
|
||||
|
||||
- job:
|
||||
name: neutron-tempest-plugin-scenario-linuxbridge-queens
|
||||
@ -169,6 +170,7 @@
|
||||
Q_AGENT: linuxbridge
|
||||
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
|
||||
TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin
|
||||
ADVANCED_INSTANCE_TYPE: ds512M
|
||||
devstack_local_conf:
|
||||
post-config:
|
||||
$NEUTRON_CONF:
|
||||
|
@ -167,6 +167,7 @@
|
||||
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
|
||||
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
|
||||
TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin
|
||||
ADVANCED_INSTANCE_TYPE: ds512M
|
||||
devstack_local_conf:
|
||||
post-config:
|
||||
$NEUTRON_CONF:
|
||||
@ -226,6 +227,7 @@
|
||||
<<: *scenario_vars_rocky
|
||||
devstack_localrc:
|
||||
USE_PYTHON3: True
|
||||
ADVANCED_INSTANCE_TYPE: ds512M
|
||||
branches: ^(?!stable/rocky).*$
|
||||
irrelevant-files: *openvswitch-scenario-irrelevant-files
|
||||
|
||||
@ -263,6 +265,7 @@
|
||||
Q_ML2_TENANT_NETWORK_TYPE: vxlan
|
||||
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
|
||||
TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin
|
||||
ADVANCED_INSTANCE_TYPE: ds512M
|
||||
devstack_local_conf:
|
||||
post-config:
|
||||
$NEUTRON_CONF:
|
||||
@ -330,6 +333,7 @@
|
||||
<<: *openvswitch_vars_rocky
|
||||
devstack_localrc:
|
||||
USE_PYTHON3: True
|
||||
ADVANCED_INSTANCE_TYPE: ds512M
|
||||
branches: ^(?!stable/rocky).*$
|
||||
irrelevant-files: *iptables_hybrid_irrelevant_files
|
||||
|
||||
@ -352,6 +356,7 @@
|
||||
Q_AGENT: linuxbridge
|
||||
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
|
||||
TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin
|
||||
ADVANCED_INSTANCE_TYPE: ds512M
|
||||
devstack_local_conf:
|
||||
post-config:
|
||||
$NEUTRON_CONF:
|
||||
@ -403,6 +408,7 @@
|
||||
Q_AGENT: linuxbridge
|
||||
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
|
||||
TEMPEST_PLUGINS: /opt/stack/neutron-tempest-plugin
|
||||
ADVANCED_INSTANCE_TYPE: ds512M
|
||||
branches: ^(?!stable/rocky).*$
|
||||
|
||||
- job:
|
||||
|
@ -130,6 +130,7 @@
|
||||
network_available_features: *available_features
|
||||
devstack_localrc:
|
||||
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
|
||||
ADVANCED_INSTANCE_TYPE: ds512M
|
||||
devstack_local_conf:
|
||||
post-config:
|
||||
$NEUTRON_L3_CONF:
|
||||
@ -177,6 +178,7 @@
|
||||
Q_ML2_TENANT_NETWORK_TYPE: vxlan
|
||||
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
|
||||
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
|
||||
ADVANCED_INSTANCE_TYPE: ds512M
|
||||
devstack_local_conf:
|
||||
post-config:
|
||||
$NEUTRON_CONF:
|
||||
@ -263,6 +265,7 @@
|
||||
NETWORK_API_EXTENSIONS: "{{ (network_api_extensions + network_api_extensions_linuxbridge) | join(',') }}"
|
||||
Q_ML2_TENANT_NETWORK_TYPE: vxlan
|
||||
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
|
||||
ADVANCED_INSTANCE_TYPE: ds512M
|
||||
devstack_local_conf:
|
||||
post-config:
|
||||
$NEUTRON_CONF:
|
||||
|
@ -135,6 +135,7 @@
|
||||
network_available_features: *available_features
|
||||
devstack_localrc:
|
||||
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
|
||||
ADVANCED_INSTANCE_TYPE: ds512M
|
||||
devstack_local_conf:
|
||||
post-config:
|
||||
$NEUTRON_L3_CONF:
|
||||
@ -160,6 +161,7 @@
|
||||
network_available_features: *available_features
|
||||
devstack_localrc:
|
||||
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
|
||||
ADVANCED_INSTANCE_TYPE: ds512M
|
||||
devstack_local_conf:
|
||||
post-config:
|
||||
$NEUTRON_L3_CONF:
|
||||
@ -185,6 +187,7 @@
|
||||
network_available_features: *available_features
|
||||
devstack_localrc:
|
||||
NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
|
||||
ADVANCED_INSTANCE_TYPE: ds512M
|
||||
devstack_local_conf:
|
||||
post-config:
|
||||
$NEUTRON_L3_CONF:
|
||||
|
Loading…
Reference in New Issue
Block a user