qa/rgw/lifecycle: split transition recompress into separate jobs

Without a facet marker, teuthology concatenated all three yamls into
one job, running plain, CBC, and GCM workunits back-to-back under
whichever rgw override won.

Signed-off-by: Matthew N. Heler <matthew.heler@hotmail.com>

diff --git a/qa/suites/rgw/lifecycle/transition$/.qa b/qa/suites/rgw/lifecycle/transition$/.qa
new file mode 120000 (symlink)
index 0000000..a602a03
--- /dev/null
+++ b/qa/suites/rgw/lifecycle/transition$/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file

diff --git a/qa/suites/rgw/lifecycle/transition$/compress-encrypted.yaml b/qa/suites/rgw/lifecycle/transition$/compress-encrypted.yaml
new file mode 100644 (file)
index 0000000..8e7c3aa
--- /dev/null
+++ b/qa/suites/rgw/lifecycle/transition$/compress-encrypted.yaml
@@ -0,0 +1,8 @@
+overrides:
+  rgw:
+    enable features: [compress-encrypted]
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rgw/run-lc-encrypt-recompress.sh

diff --git a/qa/suites/rgw/lifecycle/transition$/compressed.yaml b/qa/suites/rgw/lifecycle/transition$/compressed.yaml
new file mode 100644 (file)
index 0000000..6079f6b
--- /dev/null
+++ b/qa/suites/rgw/lifecycle/transition$/compressed.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rgw/run-lc-recompress.sh

diff --git a/qa/suites/rgw/lifecycle/transition$/gcm-compress-encrypted.yaml b/qa/suites/rgw/lifecycle/transition$/gcm-compress-encrypted.yaml
new file mode 100644 (file)
index 0000000..9714351
--- /dev/null
+++ b/qa/suites/rgw/lifecycle/transition$/gcm-compress-encrypted.yaml
@@ -0,0 +1,12 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rgw crypt sse algorithm: aes-256-gcm
+  rgw:
+    enable features: [compress-encrypted]
+tasks:
+- workunit:
+    clients:
+      client.0:
+        - rgw/run-lc-encrypt-recompress.sh

diff --git a/qa/suites/rgw/lifecycle/transition/.qa b/qa/suites/rgw/lifecycle/transition/.qa
deleted file mode 120000 (symlink)
index a602a03..0000000
--- a/qa/suites/rgw/lifecycle/transition/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file

diff --git a/qa/suites/rgw/lifecycle/transition/compress-encrypted.yaml b/qa/suites/rgw/lifecycle/transition/compress-encrypted.yaml
deleted file mode 100644 (file)
index 8e7c3aa..0000000
--- a/qa/suites/rgw/lifecycle/transition/compress-encrypted.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-overrides:
-  rgw:
-    enable features: [compress-encrypted]
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rgw/run-lc-encrypt-recompress.sh

diff --git a/qa/suites/rgw/lifecycle/transition/compressed.yaml b/qa/suites/rgw/lifecycle/transition/compressed.yaml
deleted file mode 100644 (file)
index 6079f6b..0000000
--- a/qa/suites/rgw/lifecycle/transition/compressed.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rgw/run-lc-recompress.sh

diff --git a/qa/suites/rgw/lifecycle/transition/gcm-compress-encrypted.yaml b/qa/suites/rgw/lifecycle/transition/gcm-compress-encrypted.yaml
deleted file mode 100644 (file)
index 9714351..0000000
--- a/qa/suites/rgw/lifecycle/transition/gcm-compress-encrypted.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        rgw crypt sse algorithm: aes-256-gcm
-  rgw:
-    enable features: [compress-encrypted]
-tasks:
-- workunit:
-    clients:
-      client.0:
-        - rgw/run-lc-encrypt-recompress.sh