From c720e5d8a43393a2dd6b072a5d547d52a60cc6c5 Mon Sep 17 00:00:00 2001
From: Scott Grasley <scott.grasley@suse.com>
Date: Wed, 15 Nov 2017 13:50:00 -0800
Subject: [PATCH] Add Cassandra db to Monasca gate tests

  This change includes tests for both python and java monasca-persister
  tests when using Cassandra db as a time series database.

Change-Id: I6eb47a6c979689c8128d04449bf682a0a4b9059d
Story: 2001231
Task: 5793
---
 .zuul.yaml                                    | 38 +++++++++++++++++--
 .../legacy/monasca-tempest-base/run.yaml      |  5 ++-
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index f8d85cc2d..c70494721 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -23,14 +23,18 @@
     parent: monasca-tempest-base
     vars:
       database: mysql
-      lang: python
+      tsdb: influxdb
+      api_lang: python
+      persister_lang: python
 
 - job:
     name: monasca-tempest-python-postgresql
     parent: monasca-tempest-base
     vars:
       database: postgresql
-      lang: python
+      tsdb: influxdb
+      api_lang: python
+      persister_lang: python
     voting: false
 
 - job:
@@ -38,14 +42,38 @@
     parent: monasca-tempest-base
     vars:
       database: mysql
-      lang: java
+      tsdb: influxdb
+      api_lang: java
+      persister_lang: java
 
 - job:
     name: monasca-tempest-java-postgresql
     parent: monasca-tempest-base
     vars:
       database: postgresql
-      lang: java
+      tsdb: influxdb
+      api_lang: java
+      persister_lang: java
+    voting: false
+
+- job:
+    name: monasca-tempest-python-cassandra
+    parent: monasca-tempest-base
+    vars:
+      database: mysql
+      tsdb: cassandra
+      api_lang: python
+      persister_lang: python
+    voting: false
+
+- job:
+    name: monasca-tempest-java-cassandra
+    parent: monasca-tempest-base
+    vars:
+      database: mysql
+      tsdb: cassandra
+      api_lang: python
+      persister_lang: java
     voting: false
 
 - project:
@@ -56,6 +84,8 @@
         - monasca-tempest-python-postgresql
         - monasca-tempest-java-mysql
         - monasca-tempest-java-postgresql
+        - monasca-tempest-python-cassandra
+        - monasca-tempest-java-cassandra
     gate:
       jobs:
         - monasca-tempest-python-mysql
diff --git a/playbooks/legacy/monasca-tempest-base/run.yaml b/playbooks/legacy/monasca-tempest-base/run.yaml
index a553339e2..a6f355488 100644
--- a/playbooks/legacy/monasca-tempest-base/run.yaml
+++ b/playbooks/legacy/monasca-tempest-base/run.yaml
@@ -31,8 +31,9 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin monasca-api git://git.openstack.org/openstack/monasca-api
-          MONASCA_API_IMPLEMENTATION_LANG="{{ lang }}"
-          MONASCA_PERSISTER_IMPLEMENTATION_LANG="{{ lang }}"
+          MONASCA_API_IMPLEMENTATION_LANG="{{ api_lang }}"
+          MONASCA_PERSISTER_IMPLEMENTATION_LANG="{{ persister_lang }}"
+          MONASCA_METRICS_DB="{{ tsdb }}"
 
           EOF
         executable: /bin/bash