From 645574c2286a611544fc9a4ed1e3d69dad0e9eeb Mon Sep 17 00:00:00 2001
From: Witold Bedyk <witold.bedyk@est.fujitsu.com>
Date: Thu, 8 Mar 2018 12:48:57 +0100
Subject: [PATCH] Remove PostgreSQL tempest jobs from Zuul

* remove monasca-tempest-*-postgresql jobs
* rename monasca-tempest-*-mysql -> monasca-tempest-*-influxdb jobs
* move `database` var to parent job

Story: 2001650
Task: 6669

Change-Id: Iac2cd9520caa313f0b1dc99204001bbf40d76a04
Depends-On: https://review.openstack.org/550874
---
 .zuul.yaml | 44 ++++++++++----------------------------------
 1 file changed, 10 insertions(+), 34 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index ec7fffd71..34495b556 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -18,50 +18,29 @@
       - openstack/python-monascaclient
       - openstack/tempest
       - openstack/monasca-tempest-plugin
-
-- job:
-    name: monasca-tempest-python-mysql
-    parent: monasca-tempest-base
     vars:
       database: mysql
+
+- job:
+    name: monasca-tempest-python-influxdb
+    parent: monasca-tempest-base
+    vars:
       tsdb: influxdb
       api_lang: python
       persister_lang: python
 
 - job:
-    name: monasca-tempest-python-postgresql
+    name: monasca-tempest-java-influxdb
     parent: monasca-tempest-base
     vars:
-      database: postgresql
-      tsdb: influxdb
-      api_lang: python
-      persister_lang: python
-    voting: false
-
-- job:
-    name: monasca-tempest-java-mysql
-    parent: monasca-tempest-base
-    vars:
-      database: mysql
       tsdb: influxdb
       api_lang: java
       persister_lang: java
 
-- job:
-    name: monasca-tempest-java-postgresql
-    parent: monasca-tempest-base
-    vars:
-      database: postgresql
-      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
@@ -70,7 +49,6 @@
     name: monasca-tempest-java-cassandra
     parent: monasca-tempest-base
     vars:
-      database: mysql
       tsdb: cassandra
       api_lang: python
       persister_lang: java
@@ -79,15 +57,13 @@
     name: openstack/monasca-api
     check:
       jobs:
-        - monasca-tempest-python-mysql
-        - monasca-tempest-python-postgresql
-        - monasca-tempest-java-mysql
-        - monasca-tempest-java-postgresql
+        - monasca-tempest-python-influxdb
+        - monasca-tempest-java-influxdb
         - monasca-tempest-python-cassandra
         - monasca-tempest-java-cassandra
     gate:
       jobs:
-        - monasca-tempest-python-mysql
-        - monasca-tempest-java-mysql
+        - monasca-tempest-python-influxdb
+        - monasca-tempest-java-influxdb
         - monasca-tempest-python-cassandra
         - monasca-tempest-java-cassandra