From c1b2ce0f0ac0630880aea01b5077ae822fbb960f 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] Add focal-victoria to the test gate

Also reduce chances of spurious mysql-innodb-cluster "super-read-only"
failures.

Change-Id: Idbee09f4949dbf64dc09b86cc1c7e9b1b97722cf
Partial-Bug: #1882205
---
 test-requirements.txt              | 1 +
 tests/bundles/focal-ussuri.yaml    | 2 ++
 tests/bundles/focal-victoria.yaml  | 2 ++
 tests/bundles/groovy-victoria.yaml | 2 ++
 tests/tests.yaml                   | 2 +-
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 7d9c2587..ae12bb78 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -14,5 +14,6 @@ flake8>=2.2.4,<=2.4.1
 stestr>=2.2.0
 coverage>=4.5.2
 pyudev              # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)
+juju!=2.8.3         # this version causes spurious JujuAPIError's
 git+https://github.com/openstack-charmers/zaza.git#egg=zaza;python_version>='3.0'
 git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml
index 9bac3c61..23f1b138 100644
--- a/tests/bundles/focal-ussuri.yaml
+++ b/tests/bundles/focal-ussuri.yaml
@@ -44,6 +44,8 @@ applications:
     num_units: 3
     options:
       source: *openstack-origin
+      # Reduce chances of spurious "super-read-only" failures, see lp:1882205
+      expel-timeout: 20
     to:
       - '0'
       - '1'
diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml
index ec603c0b..b13f0d5e 100644
--- a/tests/bundles/focal-victoria.yaml
+++ b/tests/bundles/focal-victoria.yaml
@@ -44,6 +44,8 @@ applications:
     num_units: 3
     options:
       source: *openstack-origin
+      # Reduce chances of spurious "super-read-only" failures, see lp:1882205
+      expel-timeout: 20
     to:
       - '0'
       - '1'
diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/groovy-victoria.yaml
index 19e3e594..51257cc1 100644
--- a/tests/bundles/groovy-victoria.yaml
+++ b/tests/bundles/groovy-victoria.yaml
@@ -44,6 +44,8 @@ applications:
     num_units: 3
     options:
       source: *openstack-origin
+      # Reduce chances of spurious "super-read-only" failures, see lp:1882205
+      expel-timeout: 20
     to:
       - '0'
       - '1'
diff --git a/tests/tests.yaml b/tests/tests.yaml
index 8389ac54..6cd87ea7 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -2,6 +2,7 @@ charm_name: nova-cloud-controller
 smoke_bundles:
 - bionic-ussuri
 gate_bundles:
+- focal-victoria
 - focal-ussuri
 - bionic-ussuri
 - bionic-train
@@ -15,7 +16,6 @@ gate_bundles:
 - trusty-mitaka
 dev_bundles:
 - groovy-victoria
-- focal-victoria
 configure:
 - zaza.openstack.charm_tests.glance.setup.add_cirros_image
 - zaza.openstack.charm_tests.keystone.setup.add_demo_user