Reconfigure tempest configuration

Switch tempest test to zuul3 native, and add proper configuration  
for events tempest test.


Story: 2004549
Task: 28303
Depends-On: https://review.openstack.org/599575

Change-Id: If630fc2e13ed4a81bb7b74c4238d1e28c78490d7
This commit is contained in:
Adrian Czarnecki 2018-12-05 12:55:00 +01:00
parent bcc8cb36c1
commit e86c6fbc65
4 changed files with 46 additions and 94 deletions

View File

@ -1,17 +1,52 @@
- job: - job:
name: monascaevents-tempest-events-base name: monasca-events-tempest-base
parent: legacy-dsvm-base parent: devstack-tempest
run: playbooks/legacy/monasca-tempest-events-base/run.yaml
post-run: playbooks/legacy/monasca-tempest-events-base/post.yaml
timeout: 7800 timeout: 7800
required-projects: required-projects:
- openstack-infra/devstack-gate - openstack-infra/devstack-gate
- openstack/monasca-events-api - openstack/monasca-events-api
- openstack/monasca-agent
- openstack/monasca-api
- openstack/monasca-common - openstack/monasca-common
- openstack/monasca-grafana-datasource
- openstack/monasca-notification
- openstack/monasca-persister - openstack/monasca-persister
- openstack/monasca-statsd
- openstack/monasca-thresh
- openstack/monasca-ui
- openstack/python-monascaclient - openstack/python-monascaclient
- openstack/monasca-kibana-plugin
- openstack/tempest - openstack/tempest
voting: false - openstack/monasca-tempest-plugin
- openstack/monasca-log-api
vars:
tox_envlist: all
tempest_test_regex: monasca_tempest_tests.tests.event_api
devstack_plugins:
monasca-api: git://git.openstack.org/openstack/monasca-api
monasca-log-api: git://git.openstack.org/openstack/monasca-log-api
monasca-events-api: git://git.openstack.org/openstack/monasca-events-api
monasca-tempest-plugin: git://git.openstack.org/openstack/monasca-tempest-plugin
irrelevant-files:
- ^.*\.rst$
- ^.*\.md$
- ^doc/.*$
- ^releasenotes/.*$
- job:
name: monasca-events-python2
parent: monasca-events-tempest-base
vars:
devstack_localrc:
TEMPEST_PLUGINS: /opt/stack/monasca-tempest-plugin
- job:
name: monasca-events-python3
parent: monasca-events-tempest-base
vars:
devstack_localrc:
USE_PYTHON3: true
TEMPEST_PLUGINS: /opt/stack/monasca-tempest-plugin
- project: - project:
templates: templates:
@ -25,6 +60,10 @@
- release-notes-jobs-python3 - release-notes-jobs-python3
check: check:
jobs: jobs:
- monascaevents-tempest-events-base - monasca-events-python2
- monasca-events-python3
gate: gate:
queue: monasca queue: monasca
jobs:
- monasca-events-python2
- monasca-events-python3

View File

@ -34,4 +34,4 @@ function configure_elasticsearch {
fi fi
} }
$_XTRACE_ELASTICSEARCH $_XTRACE_ELASTICSEARCH

View File

@ -1,15 +0,0 @@
- hosts: primary
tasks:
- name: Copy files from {{ ansible_user_dir }}/workspace/ on node
synchronize:
src: '{{ ansible_user_dir }}/workspace/'
dest: '{{ zuul.executor.log_root }}'
mode: pull
copy_links: true
verify_host: true
rsync_opts:
- --include=/logs/**
- --include=*/
- --exclude=*
- --prune-empty-dirs

View File

@ -1,72 +0,0 @@
- hosts: all
name: Autoconverted job legacy-tempest-dsvm-monasca-python-mysql-full from old job
gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-xenial-nv
tasks:
- name: Ensure legacy workspace directory
file:
path: '{{ ansible_user_dir }}/workspace'
state: directory
- shell:
cmd: |
set -e
set -x
cat > clonemap.yaml << EOF
clonemap:
- name: openstack-infra/devstack-gate
dest: devstack-gate
EOF
/usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
git://git.openstack.org \
openstack-infra/devstack-gate
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -e
set -x
cat << 'EOF' >>"/tmp/dg-local.conf"
[[local|localrc]]
enable_plugin monasca-events-api git://git.openstack.org/openstack/monasca-events-api
EOF
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'
- shell:
cmd: |
set -e
set -x
export PYTHONUNBUFFERED=true
export ENABLED_SERVICES=tempest
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_EXERCISES=0
export DEVSTACK_GATE_POSTGRES=0
export PROJECTS="openstack/monasca-events-api $PROJECTS"
export PROJECTS="openstack/monasca-persister $PROJECTS"
export PROJECTS="openstack/monasca-common $PROJECTS"
export PROJECTS="openstack/python-monascaclient $PROJECTS"
function pre_test_hook {
source $BASE/new/monasca-events-api/monasca_events_api/tests/functional/contrib/gate_hook.sh
}
export -f pre_test_hook
function post_test_hook {
# Configure and run tempest on monasca-api installation
source $BASE/new/monasca-events-api/monasca_events_api/tests/functional/contrib/post_test_hook.sh
}
export -f post_test_hook
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
executable: /bin/bash
chdir: '{{ ansible_user_dir }}/workspace'
environment: '{{ zuul | zuul_legacy_vars }}'