From 50d1212f88b6f32c20b00e751d76f739a2b616d9 Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Wed, 17 Nov 2021 14:37:22 -0500
Subject: [PATCH] Additional test updates

* switch to release-specific zosci functional tests
* switch to yoga zosci unit test job
* add py39

Change-Id: I1741b5717ef359bdf2e2a5027164bfd093a672b2
---
 osci.yaml | 25 +++++++------------------
 tox.ini   |  5 +++++
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/osci.yaml b/osci.yaml
index c88aaac..54fa652 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,23 +1,12 @@
 - project:
     templates:
-      - charm-unit-jobs
-    check:
-      jobs:
-      - bionic-rocky
-      - bionic-stein
-      - bionic-train
-      - bionic-ussuri
-      - focal-ussuri
-      - focal-victoria
-      - focal-wallaby
-      - focal-xena
-      - focal-yoga:
-          voting: false
-      - hirsute-wallaby
-      - impish-xena:
-          voting: false
-      - jammy-yoga:
-          voting: false
+      - charm-yoga-unit-jobs
+      - charm-yoga-functional-jobs
+      - charm-xena-functional-jobs
+      - charm-wallaby-functional-jobs
+      - charm-victoria-functional-jobs
+      - charm-ussuri-functional-jobs
+      - charm-stein-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: octavia-dashboard
diff --git a/tox.ini b/tox.ini
index 22159df..faf6092 100644
--- a/tox.ini
+++ b/tox.ini
@@ -75,6 +75,11 @@ basepython = python3.8
 deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
+[testenv:py39]
+basepython = python3.9
+deps = -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
+
 [testenv:pep8]
 basepython = python3
 deps = flake8==3.9.2