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>

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 cd89c0772c3e8b56245863ae2fc08395db069aac..c83454dd73eaf83cfdaa66623260d07320ffb4fb 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 5e995da7d2c72b46262b972eb4361814f503e096..2d594c096d49a0157653c4e04a286298487630c1 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 4486d30fb613c2bfdc66c35257fa906d75e9a0b7..afcdf843cfd1c3a8f0ea54b6501da7468171fd55 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: