openstack/aodh
Code Issues Proposed changes

tempest: use new plugin + tripleo to experimental

Browse Source 
This change uses the new telemetry integration plugin
and move the tripleo jobs to experimental

Depends-On: I72ce33828febb48136e239d0e70f07674aef9d4a
Change-Id: Ie29449e64b6745707ea8593bd716f6104f4882bf
This commit is contained in:
Mehdi Abaakouk 2018-01-16 09:49:55 +01:00
parent 395a54d029
commit ce21543a5f
6 changed files with 32 additions and 236 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
.zuul.yaml
View File

@ -4,7 +4,14 @@
jobs:
- aodh-dsvm-tempest-plugin-mysql
- aodh-dsvm-tempest-plugin-postgresql
- telemetry-dsvm-integration-aodh
- telemetry-dsvm-integration
gate:
jobs:
- aodh-dsvm-tempest-plugin-mysql
- aodh-dsvm-tempest-plugin-postgresql
- telemetry-dsvm-integration
experimental:
jobs:
# TripleO jobs that deploy Telemetry.
# Note we don't use a project-template here, so it's easier
# to disable voting on one specific job if things go wrong.
@ -13,19 +20,13 @@
# and beyond.
# If you need any support to debug these jobs in case of
# failures, please reach us on #tripleo IRC channel.
- tripleo-ci-centos-7-scenario001-multinode-oooq:
voting: false
- tripleo-ci-centos-7-scenario001-multinode-oooq-container:
voting: false
- tripleo-ci-centos-7-scenario002-multinode-oooq:
voting: false
- tripleo-ci-centos-7-scenario002-multinode-oooq-container:
voting: false
gate:
jobs:
- aodh-dsvm-tempest-plugin-mysql
- aodh-dsvm-tempest-plugin-postgresql
- telemetry-dsvm-integration-aodh
# NOTE(sileht): These job takes 3 hours and fail most of the times.
# While other jobs take 20-30 minutes
# We can reenable it when they take less times.
- tripleo-ci-centos-7-scenario001-multinode-oooq
- tripleo-ci-centos-7-scenario001-multinode-oooq-container
- tripleo-ci-centos-7-scenario002-multinode-oooq
- tripleo-ci-centos-7-scenario002-multinode-oooq-container
- job:
name: aodh-dsvm-tempest-plugin-mysql
@ -33,13 +34,12 @@
run: playbooks/legacy/aodh-dsvm-tempest-plugin-mysql/run.yaml
post-run: playbooks/legacy/aodh-dsvm-tempest-plugin-mysql/post.yaml
timeout: 7800
# Disabling this job in order to remove aodh tempest plugin as they are
# moved to telemetry-tempest-plugin, It will be reenabled once this patch
# get's merged.
voting: false
required-projects:
- openstack-infra/devstack-gate
- openstack/aodh
# To install Gnocchi
- openstack/ceilometer
- openstack/telemetry-tempest-plugin
- openstack/tempest
- job:
@ -48,27 +48,10 @@
run: playbooks/legacy/aodh-dsvm-tempest-plugin-postgresql/run.yaml
post-run: playbooks/legacy/aodh-dsvm-tempest-plugin-postgresql/post.yaml
timeout: 7800
# Disabling this job in order to remove aodh tempest plugin as they are
# moved to telemetry-tempest-plugin, It will be reenabled once this patch
# get's merged.
voting: false
required-projects:
- openstack-infra/devstack-gate
- openstack/aodh
- openstack/tempest
- job:
name: telemetry-dsvm-integration-aodh
parent: legacy-dsvm-base
run: playbooks/legacy/telemetry-dsvm-integration-aodh/run.yaml
post-run: playbooks/legacy/telemetry-dsvm-integration-aodh/post.yaml
timeout: 7800
required-projects:
- openstack-infra/devstack-gate
- openstack/aodh
# To install Gnocchi
- openstack/ceilometer
- openstack/panko
# following are required when DEVSTACK_GATE_HEAT, which this
# job turns on
- openstack/dib-utils
- openstack/diskimage-builder
- openstack/telemetry-tempest-plugin
- openstack/tempest

40
devstack/gate/gate_hook.sh
View File

@ -1,40 +0,0 @@
#!/bin/bash
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
# This script is executed inside gate_hook function in devstack gate.
ENABLED_SERVICES="key,aodh-api,aodh-notifier,aodh-evaluator"
ENABLED_SERVICES+="ceilometer-acompute,ceilometer-acentral,ceilometer-anotification,"
ENABLED_SERVICES+="ceilometer-collector,ceilometer-api,"
# The backend is passed in by the job as the first and only argument
export AODH_BACKEND="${1}"
export DEVSTACK_GATE_INSTALL_TESTONLY=1
export DEVSTACK_GATE_NO_SERVICES=1
export DEVSTACK_GATE_TEMPEST=0
export DEVSTACK_GATE_EXERCISES=0
export KEEP_LOCALRC=1
# default to mysql
case $AODH_BACKEND in
postgresql)
export DEVSTACK_GATE_POSTGRES=1
;;
esac
DEVSTACK_LOCAL_CONFIG+=$'\n'"export AODH_BACKEND=${AODH_BACKEND}"
export ENABLED_SERVICES
$BASE/new/devstack-gate/devstack-vm-gate.sh

13
playbooks/legacy/aodh-dsvm-tempest-plugin-mysql/run.yaml
View File

@ -42,16 +42,13 @@
set -x
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_REGEX="ceilometer.tests.tempest.aodh"
export DEVSTACK_GATE_TEMPEST_REGEX="telemetry_tempest_plugin.aodh"
export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
export PROJECTS="openstack/aodh $PROJECTS"
export PROJECTS="openstack/aodh openstack/ceilometer openstack/telemetry-tempest-plugin $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin telemetry-tempest-plugin git://git.openstack.org/openstack/telemetry-tempest-plugin"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
export AODH_BACKEND=mysql
if [ "mysql" = "postgresql" ] ; then
export DEVSTACK_GATE_POSTGRES=1
fi
if [ "x" = "x-neutron" ] ; then
export DEVSTACK_GATE_NEUTRON=1
fi
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
executable: /bin/bash

14
playbooks/legacy/aodh-dsvm-tempest-plugin-postgresql/run.yaml
View File

@ -43,16 +43,14 @@
set -x
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_REGEX="ceilometer.tests.tempest.aodh"
export DEVSTACK_GATE_TEMPEST_REGEX="telemetry_tempest_plugin.aodh"
export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
export PROJECTS="openstack/aodh $PROJECTS"
export PROJECTS="openstack/aodh openstack/ceilometer openstack/telemetry-tempest-plugin $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin telemetry-tempest-plugin git://git.openstack.org/openstack/telemetry-tempest-plugin"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
export AODH_BACKEND=postgresql
if [ "postgresql" = "postgresql" ] ; then
export DEVSTACK_GATE_POSTGRES=1
fi
if [ "x" = "x-neutron" ] ; then
export DEVSTACK_GATE_NEUTRON=1
fi
export DEVSTACK_GATE_POSTGRES=1
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
executable: /bin/bash

80
playbooks/legacy/telemetry-dsvm-integration-aodh/post.yaml
View File

@ -1,80 +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=**/*nose_results.html
- --include=*/
- --exclude=*
- --prune-empty-dirs
- 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=**/*testr_results.html.gz
- --include=*/
- --exclude=*
- --prune-empty-dirs
- 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=/.testrepository/tmp*
- --include=*/
- --exclude=*
- --prune-empty-dirs
- 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=**/*testrepository.subunit.gz
- --include=*/
- --exclude=*
- --prune-empty-dirs
- name: Copy files from {{ ansible_user_dir }}/workspace/ on node
synchronize:
src: '{{ ansible_user_dir }}/workspace/'
dest: '{{ zuul.executor.log_root }}/tox'
mode: pull
copy_links: true
verify_host: true
rsync_opts:
- --include=/.tox/*/log/*
- --include=*/
- --exclude=*
- --prune-empty-dirs
- 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

62
playbooks/legacy/telemetry-dsvm-integration-aodh/run.yaml
View File

@ -1,62 +0,0 @@
- hosts: all
name: Autoconverted job legacy-telemetry-dsvm-integration-aodh from old job gate-telemetry-dsvm-integration-aodh-ubuntu-xenial
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
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_HEAT=1
export DEVSTACK_GATE_NEUTRON=1
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_EXERCISES=0
export DEVSTACK_GATE_INSTALL_TESTONLY=1
export DEVSTACK_GATE_TEMPEST_NOTESTS=1
export PROJECTS="openstack/ceilometer openstack/aodh openstack/panko"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=gnocchi"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_ARCHIVE_POLICY=high"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=15"
export DEVSTACK_PROJECT_FROM_GIT=$ZUUL_SHORT_PROJECT_NAME
function post_test_hook {
cd /opt/stack/new/ceilometer/ceilometer/tests/integration/hooks/
./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 }}'