Merge "ZuulV3 jobs"
This commit is contained in:
commit
cfaab0cbdc
147
.zuul.yaml
147
.zuul.yaml
|
@ -1,39 +1,133 @@
|
||||||
- project:
|
- project:
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- watcher-tempest-multinode
|
- watcher-tempest-zuulv3
|
||||||
- legacy-rally-dsvm-watcher-rally-non-vote
|
- watcher-tempest-dummy_optim
|
||||||
|
- watcher-tempest-actuator
|
||||||
|
- watcher-tempest-basic_optim
|
||||||
|
- watcher-tempest-workload_balancing
|
||||||
|
- watcherclient-tempest-functional
|
||||||
|
- legacy-rally-dsvm-watcher-rally
|
||||||
|
gate:
|
||||||
|
jobs:
|
||||||
|
- watcher-tempest-zuulv3
|
||||||
|
- watcher-tempest-dummy_optim
|
||||||
|
- watcher-tempest-actuator
|
||||||
|
- watcher-tempest-basic_optim
|
||||||
|
- watcher-tempest-workload_balancing
|
||||||
|
- watcherclient-tempest-functional
|
||||||
|
- legacy-rally-dsvm-watcher-rally
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: legacy-rally-dsvm-watcher-rally-non-vote
|
name: watcher-tempest-dummy_optim
|
||||||
parent: legacy-rally-dsvm-watcher-rally
|
|
||||||
voting: false
|
voting: false
|
||||||
|
parent: watcher-tempest-zuulv3
|
||||||
|
vars:
|
||||||
|
tempest_test_regex: 'watcher_tempest_plugin.tests.scenario.test_execute_dummy_optim'
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: watcher-tempest-base-multinode
|
name: watcher-tempest-actuator
|
||||||
parent: legacy-dsvm-base-multinode
|
voting: false
|
||||||
run: playbooks/legacy/watcher-tempest-base-multinode/run.yaml
|
parent: watcher-tempest-zuulv3
|
||||||
post-run: playbooks/legacy/watcher-tempest-base-multinode/post.yaml
|
vars:
|
||||||
timeout: 4200
|
tempest_test_regex: 'watcher_tempest_plugin.tests.scenario.test_execute_actuator'
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: watcher-tempest-basic_optim
|
||||||
|
voting: false
|
||||||
|
parent: watcher-tempest-zuulv3
|
||||||
|
vars:
|
||||||
|
tempest_test_regex: 'watcher_tempest_plugin.tests.scenario.test_execute_basic_optim'
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: watcher-tempest-workload_balancing
|
||||||
|
voting: false
|
||||||
|
parent: watcher-tempest-zuulv3
|
||||||
|
vars:
|
||||||
|
tempest_test_regex: 'watcher_tempest_plugin.tests.scenario.test_execute_workload_balancing'
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: watcher-tempest-zuulv3
|
||||||
|
parent: devstack-tempest
|
||||||
|
voting: true
|
||||||
|
timeout: 7200
|
||||||
|
nodeset: openstack-two-node
|
||||||
|
pre-run: playbooks/pre.yaml
|
||||||
|
run: playbooks/orchestrate-tempest.yaml
|
||||||
|
roles:
|
||||||
|
- zuul: openstack/tempest
|
||||||
required-projects:
|
required-projects:
|
||||||
|
- openstack/ceilometer
|
||||||
- openstack-infra/devstack-gate
|
- openstack-infra/devstack-gate
|
||||||
- openstack/python-openstackclient
|
- openstack/python-openstackclient
|
||||||
- openstack/python-watcherclient
|
- openstack/python-watcherclient
|
||||||
- openstack/watcher
|
- openstack/watcher
|
||||||
- openstack/watcher-tempest-plugin
|
- openstack/watcher-tempest-plugin
|
||||||
nodeset: legacy-ubuntu-xenial-2-node
|
- openstack/tempest
|
||||||
|
group-vars:
|
||||||
- job:
|
subnode:
|
||||||
name: watcher-tempest-multinode
|
devstack_local_conf:
|
||||||
parent: watcher-tempest-base-multinode
|
post-config:
|
||||||
voting: false
|
$NOVA_CONF:
|
||||||
|
libvirt:
|
||||||
|
live_migration_uri: 'qemu+ssh://root@%s/system'
|
||||||
|
devstack_services:
|
||||||
|
watcher-api: false
|
||||||
|
watcher-decision-engine: false
|
||||||
|
watcher-applier: false
|
||||||
|
# We need to add TLS support for watcher plugin
|
||||||
|
tls-proxy: false
|
||||||
|
ceilometer: false
|
||||||
|
ceilometer-acompute: false
|
||||||
|
ceilometer-acentral: false
|
||||||
|
ceilometer-anotification: false
|
||||||
|
watcher: false
|
||||||
|
gnocchi-api: false
|
||||||
|
gnocchi-metricd: false
|
||||||
|
rabbit: false
|
||||||
|
mysql: false
|
||||||
|
vars:
|
||||||
|
devstack_local_conf:
|
||||||
|
post-config:
|
||||||
|
$NOVA_CONF:
|
||||||
|
libvirt:
|
||||||
|
live_migration_uri: 'qemu+ssh://root@%s/system'
|
||||||
|
test-config:
|
||||||
|
$TEMPEST_CONFIG:
|
||||||
|
compute:
|
||||||
|
min_compute_nodes: 2
|
||||||
|
compute-feature-enabled:
|
||||||
|
live_migration: true
|
||||||
|
block_migration_for_live_migration: true
|
||||||
|
devstack_localrc:
|
||||||
|
WATCHER_USE_MOD_WSGI: False
|
||||||
|
TEMPEST_PLUGINS: '/opt/stack/watcher-tempest-plugin'
|
||||||
|
tempest_test_regex: 'watcher_tempest_plugin.tests.api'
|
||||||
|
devstack_plugins:
|
||||||
|
ceilometer: https://git.openstack.org/openstack/ceilometer
|
||||||
|
watcher: https://git.openstack.org/openstack/watcher
|
||||||
|
devstack_services:
|
||||||
|
tls-proxy: false
|
||||||
|
watcher-api: true
|
||||||
|
watcher-decision-engine: true
|
||||||
|
watcher-applier: true
|
||||||
|
tempest: true
|
||||||
|
s-account: false
|
||||||
|
s-container: false
|
||||||
|
s-object: false
|
||||||
|
s-proxy: false
|
||||||
|
tox_envlist: all
|
||||||
|
tox_environment:
|
||||||
|
# Do we really need to set this? It's cargo culted
|
||||||
|
PYTHONUNBUFFERED: 'true'
|
||||||
|
zuul_copy_output:
|
||||||
|
/etc/hosts: logs
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
# This job is used by python-watcherclient repo
|
# This job is used by python-watcherclient repo
|
||||||
name: watcherclient-tempest-functional
|
name: watcherclient-tempest-functional
|
||||||
parent: legacy-dsvm-base
|
parent: devstack-tempest
|
||||||
run: playbooks/legacy/watcherclient-tempest-functional/run.yaml
|
voting: false
|
||||||
post-run: playbooks/legacy/watcherclient-tempest-functional/post.yaml
|
|
||||||
timeout: 4200
|
timeout: 4200
|
||||||
required-projects:
|
required-projects:
|
||||||
- openstack-dev/devstack
|
- openstack-dev/devstack
|
||||||
|
@ -41,3 +135,20 @@
|
||||||
- openstack/python-openstackclient
|
- openstack/python-openstackclient
|
||||||
- openstack/python-watcherclient
|
- openstack/python-watcherclient
|
||||||
- openstack/watcher
|
- openstack/watcher
|
||||||
|
- openstack/tempest
|
||||||
|
vars:
|
||||||
|
devstack_localrc:
|
||||||
|
WATCHER_USE_MOD_WSGI: False
|
||||||
|
TEMPEST_PLUGINS: '/opt/stack/python-watcherclient'
|
||||||
|
tempest_test_regex: 'watcherclient.tests.functional'
|
||||||
|
devstack_plugins:
|
||||||
|
watcher: https://git.openstack.org/openstack/watcher
|
||||||
|
devstack_services:
|
||||||
|
rabbit: true
|
||||||
|
mysql: true
|
||||||
|
tls-proxy: false
|
||||||
|
watcher-api: true
|
||||||
|
watcher-decision-engine: true
|
||||||
|
watcher-applier: true
|
||||||
|
tempest: true
|
||||||
|
tox_envlist: all
|
||||||
|
|
|
@ -179,7 +179,13 @@ function create_watcher_conf {
|
||||||
|
|
||||||
iniset $WATCHER_CONF database connection $(database_connection_url watcher)
|
iniset $WATCHER_CONF database connection $(database_connection_url watcher)
|
||||||
iniset $WATCHER_CONF api host "$WATCHER_SERVICE_HOST"
|
iniset $WATCHER_CONF api host "$WATCHER_SERVICE_HOST"
|
||||||
iniset $WATCHER_CONF api port "$WATCHER_SERVICE_PORT"
|
|
||||||
|
if is_service_enabled tls-proxy; then
|
||||||
|
iniset $WATCHER_CONF api port "$WATCHER_SERVICE_PORT_INT"
|
||||||
|
# iniset $WATCHER_CONF api enable_ssl_api "True"
|
||||||
|
else
|
||||||
|
iniset $WATCHER_CONF api port "$WATCHER_SERVICE_PORT"
|
||||||
|
fi
|
||||||
|
|
||||||
iniset $WATCHER_CONF oslo_policy policy_file $WATCHER_POLICY_YAML
|
iniset $WATCHER_CONF oslo_policy policy_file $WATCHER_POLICY_YAML
|
||||||
|
|
||||||
|
@ -297,8 +303,7 @@ function start_watcher_api {
|
||||||
|
|
||||||
# Start proxies if enabled
|
# Start proxies if enabled
|
||||||
if is_service_enabled tls-proxy; then
|
if is_service_enabled tls-proxy; then
|
||||||
start_tls_proxy '*' $WATCHER_SERVICE_PORT $WATCHER_SERVICE_HOST $WATCHER_SERVICE_PORT_INT &
|
start_tls_proxy watcher '*' $WATCHER_SERVICE_PORT $WATCHER_SERVICE_HOST $WATCHER_SERVICE_PORT_INT
|
||||||
start_tls_proxy '*' $EC2_SERVICE_PORT $WATCHER_SERVICE_HOST $WATCHER_SERVICE_PORT_INT &
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
- hosts: all
|
||||||
|
# This is the default strategy, however since orchestrate-devstack requires
|
||||||
|
# "linear", it is safer to enforce it in case this is running in an
|
||||||
|
# environment configured with a different default strategy.
|
||||||
|
strategy: linear
|
||||||
|
roles:
|
||||||
|
- orchestrate-devstack
|
||||||
|
|
||||||
|
- hosts: tempest
|
||||||
|
roles:
|
||||||
|
- setup-tempest-run-dir
|
||||||
|
- setup-tempest-data-dir
|
||||||
|
- acl-devstack-files
|
||||||
|
- run-tempest
|
|
@ -0,0 +1,3 @@
|
||||||
|
- hosts: all
|
||||||
|
roles:
|
||||||
|
- add-hostnames-to-hosts
|
|
@ -0,0 +1,16 @@
|
||||||
|
- name: Set up the list of hostnames and addresses
|
||||||
|
set_fact:
|
||||||
|
hostname_addresses: >
|
||||||
|
{% set hosts = {} -%}
|
||||||
|
{% for host, vars in hostvars.items() -%}
|
||||||
|
{% set _ = hosts.update({vars['ansible_hostname']: vars['nodepool']['private_ipv4']}) -%}
|
||||||
|
{% endfor -%}
|
||||||
|
{{- hosts -}}
|
||||||
|
- name: Add inventory hostnames to the hosts file
|
||||||
|
become: yes
|
||||||
|
lineinfile:
|
||||||
|
dest: /etc/hosts
|
||||||
|
state: present
|
||||||
|
insertafter: EOF
|
||||||
|
line: "{{ item.value }} {{ item.key }}"
|
||||||
|
with_dict: "{{ hostname_addresses }}"
|
Loading…
Reference in New Issue