From b66390efafb879d2cf8cfbdbbc04f0608b536128 Mon Sep 17 00:00:00 2001
From: Chris MacNaughton <chris@centauri.solutions>
Date: Tue, 9 Aug 2022 15:18:11 -0400
Subject: [PATCH] Remove force-deploy for Jammy

Additionally, Move jammy-yoga out of dev-bundles and
remove Impish test.

Change-Id: Ie82b0f3d3d19a3cd07be133f64a70445e974ad2b
---
 osci.yaml        | 15 ++-------------
 tests/tests.yaml |  7 -------
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/osci.yaml b/osci.yaml
index 9b8d20d..d08a33e 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -7,12 +7,8 @@
     check:
       jobs:
       - focal-xena-ec
-      - focal-yoga-ec:
-          voting: false
-      - impish-xena-ec:
-          voting: false
-      - jammy-yoga-ec:
-          voting: false
+      - focal-yoga-ec
+      - jammy-yoga-ec
     vars:
       needs_charm_build: true
       charm_build_name: ceph-proxy
@@ -34,13 +30,6 @@
       - focal-xena-ec
     vars:
       tox_extra_args: erasure-coded:focal-yoga-ec
-- job:
-    name: impish-xena-ec
-    parent: func-target
-    dependencies:
-      - focal-xena-ec
-    vars:
-      tox_extra_args: erasure-coded:impish-xena-ec
 - job:
     name: jammy-yoga-ec
     parent: func-target
diff --git a/tests/tests.yaml b/tests/tests.yaml
index fba0805..75fe404 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -14,8 +14,6 @@ tests:
 gate_bundles:
   - focal-xena
   - erasure-coded: focal-xena-ec
-
-dev_bundles:
   - focal-yoga
   - erasure-coded: focal-yoga-ec
   - jammy-yoga
@@ -43,8 +41,3 @@ target_deploy_status:
   glance:
     workload-status: waiting
     workload-status-message: "Incomplete relations: storage-backend"
-
-tests_options:
-  force_deploy:
-    - jammy-yoga
-    - jammy-yoga-ec