Rebase tobiko-devstack jobs on top of tobiko-devstack-minimal

Change-Id: I9224e73a595287a8756a0b63045592a580ea0b7a
This commit is contained in:
Federico Ressi 2021-09-02 05:09:00 +02:00
parent 13318c3200
commit e13c80ff3f
2 changed files with 2 additions and 38 deletions

View File

@ -62,6 +62,7 @@
s-container: false
s-object: false
s-proxy: false
# NOTE(slaweq): without Swift, c-bak cannot run (in the Gate at least)
c-bak: false
devstack_local_conf:
post-config:

View File

@ -27,7 +27,7 @@
- job:
abstract: false
name: devstack-tobiko
parent: devstack
parent: devstack-tobiko-minimal
nodeset: devstack-tobiko
voting: true
description: |
@ -37,12 +37,7 @@
test setup. To run a multi-node test inherit from devstack-tobiko
job and set the nodeset to a multi-node one.
required-projects:
- openstack/devstack-gate
- openstack/heat
- openstack/neutron
- openstack/requirements
- x/devstack-plugin-tobiko
- x/tobiko
roles:
- zuul: x/tobiko
timeout: 10800
@ -50,8 +45,6 @@
configure_swap_size: 8192
devstack_localrc:
GLANCE_ENABLE_QUOTAS: false
MULTI_HOST: 0
LOG_COLOR: false
NETWORK_API_EXTENSIONS: >-
address-scope,agent,allowed-address-pairs,auto-allocated-topology,
availability_zone,binding,default-subnetpools,
@ -73,9 +66,7 @@
TOBIKO_NEUTRON_IPV6_DNS_NAMESERVERS:
"{{ ipv6_dns_nameservers | join(',') }}"
devstack_plugins:
heat: https://opendev.org/openstack/heat.git
neutron: https://opendev.org/openstack/neutron.git
devstack-plugin-tobiko: https://opendev.org/x/devstack-plugin-tobiko.git
devstack_services:
heat: true
h-api: true
@ -88,13 +79,10 @@
# neutron-legacy isn't used and would not load proper files
q-dns: true
# see bug #1860753 (https://bugs.launchpad.net/devstack/+bug/1860753)
memory_tracker: false
neutron-qos: true
neutron-segments: true
neutron-trunk: true
neutron-uplink-status-propagation: true
tempest: false
tls-proxy: false
# NOTE(slaweq): Swift can't run with python3 currently
s-account: false
s-container: false
@ -111,32 +99,7 @@
- 1.0.0.1
- 8.8.8.8
ipv6_dns_nameservers: []
zuul_copy_output:
'{{ stage_dir }}/stackviz': logs
"{{ devstack_base_dir }}/data/ovn": "logs"
"{{ devstack_base_dir }}/data/ovs": "logs"
"{{ devstack_log_dir }}/ovsdb-server-nb.log": "logs"
"{{ devstack_log_dir }}/ovsdb-server-sb.log": "logs"
extensions_to_txt:
conf: true
log: true
yaml: true
yml: true
test_log_debug: true
test_case_timeout: 1800
test_workflow: gate
requirements_dir: >-
{{ ansible_user_dir }}/src/opendev.org/openstack/requirements
upper_constraints_file: '{{ requirements_dir }}/upper-constraints.txt'
pre-run: playbooks/devstack/pre.yaml
run: playbooks/devstack/run.yaml
post-run: playbooks/devstack/post.yaml
irrelevant-files:
- ^.*\.rst$
- ^doc/
- ^infrared_plugin/
- ^releasenotes/
- ^report/
- job:
name: devstack-tobiko-centos