From 89aff60089855909fce679c0a6bf3c161c051cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Tr=C4=99bski?= Date: Wed, 7 Sep 2016 11:22:24 +0200 Subject: [PATCH] Monasca Gate Setup for ORM+PostgreSQL This change aims to: * unify gate template * add possibility to run tempest with PostgreSQL * add possibility to run tempest with ORM Change-Id: Ifc6bdd2da1bc5f417895b54db4714c88fce8911f --- jenkins/jobs/monasca.yaml | 82 ++++++++++----------------------------- zuul/layout.yaml | 76 ++++++++++++++++++++---------------- 2 files changed, 63 insertions(+), 95 deletions(-) diff --git a/jenkins/jobs/monasca.yaml b/jenkins/jobs/monasca.yaml index 7c55c03ae4..98f2082ab9 100644 --- a/jenkins/jobs/monasca.yaml +++ b/jenkins/jobs/monasca.yaml @@ -1,5 +1,5 @@ - job-template: - name: 'gate-tempest-dsvm-monasca-python-full-{node}{suffix}' + name: 'gate-tempest-dsvm-monasca-{lang}-{backend}-full-{node}{suffix}' node: '{node}' wrappers: @@ -14,9 +14,21 @@ - shell: | #!/bin/bash -xe export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=0 + export ENABLED_SERVICES=tempest + + export DEVSTACK_GATE_NEUTRON=1 + export DEVSTACK_GATE_EXERCISES=0 + export DEVSTACK_LOCAL_CONFIG="enable_plugin monasca-api git://git.openstack.org/openstack/monasca-api" + if [ {backend} == "postgresql" ]; then + export DEVSTACK_GATE_POSTGRES=1 + else + export DEVSTACK_GATE_POSTGRES=0 + fi + export DEVSTACK_LOCAL_CONFIG+=$'\n'"MONASCA_API_IMPLEMENTATION_LANG={lang}" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"MONASCA_PERSISTER_IMPLEMENTATION_LANG={lang}" + export PROJECTS="openstack/monasca-api $PROJECTS" export PROJECTS="openstack/monasca-persister $PROJECTS" export PROJECTS="openstack/monasca-common $PROJECTS" @@ -46,74 +58,22 @@ - devstack-logs - console-log -- job-template: - name: 'gate-tempest-dsvm-monasca-java-full-{node}{suffix}' - node: '{node}' - - wrappers: - - build-timeout: - timeout: 130 - - timestamps - - builders: - - link-logs - - net-info - - devstack-checkout - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_NEUTRON=0 - export ENABLED_SERVICES=tempest - export DEVSTACK_LOCAL_CONFIG="enable_plugin monasca-api git://git.openstack.org/openstack/monasca-api" - export PROJECTS="openstack/monasca-api $PROJECTS" - export PROJECTS="openstack/monasca-persister $PROJECTS" - export PROJECTS="openstack/monasca-common $PROJECTS" - export PROJECTS="openstack/monasca-agent $PROJECTS" - export PROJECTS="openstack/monasca-notification $PROJECTS" - export PROJECTS="openstack/monasca-thresh $PROJECTS" - export PROJECTS="openstack/monasca-statsd $PROJECTS" - export PROJECTS="openstack/python-monascaclient $PROJECTS" - export PROJECTS="openstack/monasca-grafana-datasource $PROJECTS" - export PROJECTS="openstack/monasca-ui $PROJECTS" - - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MONASCA_API_IMPLEMENTATION_LANG=java" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"MONASCA_PERSISTER_IMPLEMENTATION_LANG=java" - - function pre_test_hook {{ - source $BASE/new/monasca-api/devstack/pre_test_hook.sh - }} - export -f pre_test_hook - - function post_test_hook {{ - # Configure and run tempest on monasca-api installation - source $BASE/new/monasca-api/devstack/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 - - publishers: - - devstack-logs - - console-log - - job-group: name: 'tempest-monasca-full-jobs' jobs: - - 'gate-tempest-dsvm-monasca-python-full-{node}{suffix}': - node: - - 'ubuntu-trusty' - - 'ubuntu-xenial' - suffix: - - '' - - '-nv' - - 'gate-tempest-dsvm-monasca-java-full-{node}{suffix}': + - 'gate-tempest-dsvm-monasca-{lang}-{backend}-full-{node}{suffix}': node: - 'ubuntu-trusty' - 'ubuntu-xenial' suffix: - '' - '-nv' + lang: + - 'python' + - 'java' + backend: + - 'mysql' + - 'postgresql' - job-template: name: 'gate-tempest-dsvm-monasca-log-api-{node}{suffix}' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 60c0c96d6a..78e37a43a6 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -11187,10 +11187,12 @@ projects: - gate-monasca-agent-python27-ubuntu-trusty - gate-monasca-agent-pep8-ubuntu-xenial - gate-monasca-agent-python27-ubuntu-xenial - - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv - - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv - - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial-nv - - gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv + - gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-trusty-nv + - gate-tempest-dsvm-monasca-java-mysql-full-ubuntu-trusty-nv + - gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-xenial-nv + - gate-tempest-dsvm-monasca-java-mysql-full-ubuntu-xenial-nv + - gate-tempest-dsvm-monasca-python-postgresql-full-ubuntu-xenial-nv + - gate-tempest-dsvm-monasca-java-postgresql-full-ubuntu-xenial-nv gate: - gate-monasca-agent-pep8-ubuntu-trusty - gate-monasca-agent-python27-ubuntu-trusty @@ -11223,10 +11225,12 @@ projects: - gate-monasca-api-python27-ubuntu-xenial - gate-monasca-api-maven-build-ubuntu-trusty - gate-monasca-api-maven-build-ubuntu-xenial - - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty - - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty - - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial - - gate-tempest-dsvm-monasca-java-full-ubuntu-xenial + - gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-trusty + - gate-tempest-dsvm-monasca-java-mysql-full-ubuntu-trusty + - gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-xenial + - gate-tempest-dsvm-monasca-java-mysql-full-ubuntu-xenial + - gate-tempest-dsvm-monasca-python-postgresql-full-ubuntu-xenial-nv + - gate-tempest-dsvm-monasca-java-postgresql-full-ubuntu-xenial-nv gate: - gate-monasca-api-pep8-ubuntu-trusty - gate-monasca-api-python27-ubuntu-trusty @@ -11234,10 +11238,10 @@ projects: - gate-monasca-api-python27-ubuntu-xenial - gate-monasca-api-maven-build-ubuntu-trusty - gate-monasca-api-maven-build-ubuntu-xenial - - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty - - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty - - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial - - gate-tempest-dsvm-monasca-java-full-ubuntu-xenial + - gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-trusty + - gate-tempest-dsvm-monasca-java-mysql-full-ubuntu-trusty + - gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-xenial + - gate-tempest-dsvm-monasca-java-mysql-full-ubuntu-xenial post: - monasca-api-localrepo-upload-ubuntu-trusty - monasca-api-localrepo-upload-ubuntu-xenial @@ -11270,10 +11274,12 @@ projects: - gate-monasca-common-python27-ubuntu-xenial - gate-monasca-common-maven-build-ubuntu-trusty - gate-monasca-common-maven-build-ubuntu-xenial - - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv - - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv - - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial-nv - - gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv + - gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-trusty-nv + - gate-tempest-dsvm-monasca-java-mysql-full-ubuntu-trusty-nv + - gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-xenial-nv + - gate-tempest-dsvm-monasca-java-mysql-full-ubuntu-xenial-nv + - gate-tempest-dsvm-monasca-python-postgresql-full-ubuntu-xenial-nv + - gate-tempest-dsvm-monasca-java-postgresql-full-ubuntu-xenial-nv gate: - gate-monasca-common-pep8-ubuntu-trusty - gate-monasca-common-python27-ubuntu-trusty @@ -11335,10 +11341,12 @@ projects: - gate-monasca-notification-python27-ubuntu-trusty - gate-monasca-notification-pep8-ubuntu-xenial - gate-monasca-notification-python27-ubuntu-xenial - - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv - - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv - - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial-nv - - gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv + - gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-trusty-nv + - gate-tempest-dsvm-monasca-java-mysql-full-ubuntu-trusty-nv + - gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-xenial-nv + - gate-tempest-dsvm-monasca-java-mysql-full-ubuntu-xenial-nv + - gate-tempest-dsvm-monasca-python-postgresql-full-ubuntu-xenial-nv + - gate-tempest-dsvm-monasca-java-postgresql-full-ubuntu-xenial-nv gate: - gate-monasca-notification-pep8-ubuntu-trusty - gate-monasca-notification-python27-ubuntu-trusty @@ -11358,10 +11366,10 @@ projects: - gate-monasca-persister-python27-ubuntu-xenial - gate-monasca-persister-maven-build-ubuntu-trusty - gate-monasca-persister-maven-build-ubuntu-xenial - - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty - - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv - - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial - - gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv + - gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-trusty + - gate-tempest-dsvm-monasca-java-mysql-full-ubuntu-trusty-nv + - gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-xenial + - gate-tempest-dsvm-monasca-java-mysql-full-ubuntu-xenial-nv gate: - gate-monasca-persister-pep8-ubuntu-trusty - gate-monasca-persister-python27-ubuntu-trusty @@ -11369,8 +11377,8 @@ projects: - gate-monasca-persister-python27-ubuntu-xenial - gate-monasca-persister-maven-build-ubuntu-trusty - gate-monasca-persister-maven-build-ubuntu-xenial - - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty - - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial + - gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-trusty + - gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-xenial post: - monasca-persister-localrepo-upload-ubuntu-trusty - monasca-persister-localrepo-upload-ubuntu-xenial @@ -11386,10 +11394,10 @@ projects: - gate-monasca-statsd-python27-ubuntu-trusty - gate-monasca-statsd-pep8-ubuntu-xenial - gate-monasca-statsd-python27-ubuntu-xenial - - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv - - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv - - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial-nv - - gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv + - gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-trusty-nv + - gate-tempest-dsvm-monasca-java-mysql-full-ubuntu-trusty-nv + - gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-xenial-nv + - gate-tempest-dsvm-monasca-java-mysql-full-ubuntu-xenial-nv gate: - gate-monasca-statsd-pep8-ubuntu-trusty - gate-monasca-statsd-python27-ubuntu-trusty @@ -11402,10 +11410,10 @@ projects: check: - gate-monasca-thresh-maven-build-ubuntu-trusty - gate-monasca-thresh-maven-build-ubuntu-xenial - - gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv - - gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv - - gate-tempest-dsvm-monasca-python-full-ubuntu-xenial-nv - - gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv + - gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-trusty-nv + - gate-tempest-dsvm-monasca-java-mysql-full-ubuntu-trusty-nv + - gate-tempest-dsvm-monasca-python-mysql-full-ubuntu-xenial-nv + - gate-tempest-dsvm-monasca-java-mysql-full-ubuntu-xenial-nv gate: - gate-monasca-thresh-maven-build-ubuntu-trusty - gate-monasca-thresh-maven-build-ubuntu-xenial