From 423a9bf584de930c9718f8edf6e4ba0dbdb25ffd Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Mon, 4 Mar 2019 18:42:53 +0100
Subject: [PATCH] Add API v2 jobs (scenario, tempest); buildimages fixes

Run also: the API v2 scenario and tempest tests on both the check
and the gate queue.

Remove the list of plugins from required-project, as it was added
to the definition of the job in sahara-tests.git.

Finally, make sure that the base buildimages job depend on the
sahara repository and that it uses the sahara source directory
as working directory.

Change-Id: I97a302e253516cdd827c522178fca5fb5590f00c
---
 .zuul.yaml                     | 43 +++++++++-------------------------
 playbooks/buildimages/run.yaml |  2 +-
 2 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 3ae3fc44b9..f290afc918 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -13,22 +13,10 @@
       jobs:
         - openstack-tox-pylint:
             voting: false
-        - sahara-tests-scenario:
-            required-projects:
-              - openstack/sahara-plugin-ambari
-              - openstack/sahara-plugin-cdh
-              - openstack/sahara-plugin-mapr
-              - openstack/sahara-plugin-spark
-              - openstack/sahara-plugin-storm
-              - openstack/sahara-plugin-vanilla
-        - sahara-tests-tempest:
-            required-projects:
-              - openstack/sahara-plugin-ambari
-              - openstack/sahara-plugin-cdh
-              - openstack/sahara-plugin-mapr
-              - openstack/sahara-plugin-spark
-              - openstack/sahara-plugin-storm
-              - openstack/sahara-plugin-vanilla
+        - sahara-tests-scenario
+        - sahara-tests-scenario-v2
+        - sahara-tests-tempest
+        - sahara-tests-tempest-v2
         - openstack-tox-cover:
             voting: false
         - sahara-grenade:
@@ -36,22 +24,10 @@
     gate:
       queue: sahara
       jobs:
-        - sahara-tests-scenario:
-            required-projects:
-              - openstack/sahara-plugin-ambari
-              - openstack/sahara-plugin-cdh
-              - openstack/sahara-plugin-mapr
-              - openstack/sahara-plugin-spark
-              - openstack/sahara-plugin-storm
-              - openstack/sahara-plugin-vanilla
-        - sahara-tests-tempest:
-            required-projects:
-              - openstack/sahara-plugin-ambari
-              - openstack/sahara-plugin-cdh
-              - openstack/sahara-plugin-mapr
-              - openstack/sahara-plugin-spark
-              - openstack/sahara-plugin-storm
-              - openstack/sahara-plugin-vanilla
+        - sahara-tests-scenario
+        - sahara-tests-scenario-v2
+        - sahara-tests-tempest
+        - sahara-tests-tempest-v2
         - sahara-grenade:
             voting: false
 
@@ -92,9 +68,12 @@
 - job:
     name: sahara-buildimages-base
     nodeset: centos-7
+    vars:
+      sahara_src_dir: src/git.openstack.org/openstack/sahara
     run: playbooks/buildimages/run.yaml
     timeout: 7200
     required-projects:
+      - openstack/sahara
       - openstack/sahara-plugin-ambari
       - openstack/sahara-plugin-cdh
       - openstack/sahara-plugin-mapr
diff --git a/playbooks/buildimages/run.yaml b/playbooks/buildimages/run.yaml
index 4632d187e7..cc3da01b48 100644
--- a/playbooks/buildimages/run.yaml
+++ b/playbooks/buildimages/run.yaml
@@ -2,5 +2,5 @@
   roles:
     - role: bindep
       bindep_profile: test
-      bindep_dir: "{{ zuul.project.src_dir }}"
+      bindep_dir: "{{ sahara_src_dir|default(zuul_work_dir) }}"
     - build-sahara-images-cli