qa/suites/upgrade: exclude rocky when Squid is involved

Rocky is not supported for Squid. If teuthology tries to schedule
a squid-x upgrade test on rocky, that test will be skipped.

Signed-off-by: Laura Flores <lflores@ibm.com>
(cherry picked from commit 4c7e4c5cd84f2cbaf2bb818d6ff4f23c4c8a6095)

diff --git a/qa/suites/upgrade/squid-x/parallel/overrides/ignorelist_health.yaml b/qa/suites/upgrade/squid-x/parallel/overrides/ignorelist_health.yaml
index 96c27c5344134b0715f9ee789d29e07912edf6a4..dbd2eb69afdd2112aa7560a8270c12304c7df201 100644 (file)
--- a/qa/suites/upgrade/squid-x/parallel/overrides/ignorelist_health.yaml
+++ b/qa/suites/upgrade/squid-x/parallel/overrides/ignorelist_health.yaml
@@ -1,3 +1,6 @@
+teuthology:
+  postmerge:
+    - if yaml.os_type == "rocky" then reject() end
 overrides:
   ceph:
     log-ignorelist:

diff --git a/qa/suites/upgrade/squid-x/stress-split/overrides/ignorelist_health.yaml b/qa/suites/upgrade/squid-x/stress-split/overrides/ignorelist_health.yaml
index 96c27c5344134b0715f9ee789d29e07912edf6a4..dbd2eb69afdd2112aa7560a8270c12304c7df201 100644 (file)
--- a/qa/suites/upgrade/squid-x/stress-split/overrides/ignorelist_health.yaml
+++ b/qa/suites/upgrade/squid-x/stress-split/overrides/ignorelist_health.yaml
@@ -1,3 +1,6 @@
+teuthology:
+  postmerge:
+    - if yaml.os_type == "rocky" then reject() end
 overrides:
   ceph:
     log-ignorelist:

diff --git a/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks.yaml b/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks.yaml
index 6006f72365484c757fb49c86170e05d4bc5643ff..0e56f4f8da970bc997e7ef5d205ffb41d7bc24c7 100644 (file)
--- a/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks.yaml
+++ b/qa/suites/upgrade/telemetry-upgrade/squid-x/1-tasks.yaml
@@ -1,3 +1,6 @@
+teuthology:
+  postmerge:
+    - if yaml.os_type == "rocky" then reject() end
 overrides:
   ceph:
     log-ignorelist: