From 894131d2aeed97b39750d507dab7210d2126d3f2 Mon Sep 17 00:00:00 2001
From: Aurelien Lourot <aurelien.lourot@canonical.com>
Date: Fri, 28 Aug 2020 14:05:06 +0200
Subject: [PATCH] Work around missing dependencies on focal-victoria

Also add focal-victoria to the test gate.

Func-Test-Pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/425
Change-Id: I80e0f8f975a263fbe4c92bdeb2790ebd49cf68d9
Closes-Bug: #1895300
Related-Bug: #1893935
---
 hooks/heat_utils.py | 7 +++++++
 tests/tests.yaml    | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/hooks/heat_utils.py b/hooks/heat_utils.py
index 8851a88..f82fef4 100644
--- a/hooks/heat_utils.py
+++ b/hooks/heat_utils.py
@@ -97,6 +97,13 @@ PY3_PACKAGES = [
     'python3-memcache',
     'python3-swiftclient',
     'python3-six',
+
+    # NOTE(lourot): these dependencies are declared as "recommended" on the
+    # heat-engine package but starting from focal-victoria they are actually
+    # hard dependencies. Until this is fixed we need this workaround. See
+    # lp:1893935
+    'python3-vitrageclient',
+    'python3-zunclient',
 ]
 
 VERSION_PACKAGE = 'heat-common'
diff --git a/tests/tests.yaml b/tests/tests.yaml
index b4f2e91..09e671b 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -13,8 +13,8 @@ gate_bundles:
   - bionic-train
   - bionic-ussuri
   - focal-ussuri
-dev_bundles:
   - focal-victoria
+dev_bundles:
   - groovy-victoria
 configure:
   - zaza.openstack.charm_tests.glance.setup.add_cirros_image