From: Casey Bodley <cbodley@redhat.com>
Date: Tue, 27 Jun 2023 21:02:34 +0000 (-0400)
Subject: qa/rgw/sts: rename tasks, don't duplicate s3tests
X-Git-Tag: v19.0.0~934^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7d981bfa1a1ebc6892ea6ce413d13799269033da;p=ceph.git

qa/rgw/sts: rename tasks, don't duplicate s3tests

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/qa/suites/rgw/sts/tasks/1-keycloak.yaml b/qa/suites/rgw/sts/tasks/1-keycloak.yaml
new file mode 100644
index 000000000000..31263752941b
--- /dev/null
+++ b/qa/suites/rgw/sts/tasks/1-keycloak.yaml
@@ -0,0 +1,5 @@
+tasks:
+- tox: [ client.0 ]
+- keycloak:
+    client.0:
+      keycloak_version: 11.0.0
diff --git a/qa/suites/rgw/sts/tasks/2-s3tests.yaml b/qa/suites/rgw/sts/tasks/2-s3tests.yaml
new file mode 100644
index 000000000000..61726df01c04
--- /dev/null
+++ b/qa/suites/rgw/sts/tasks/2-s3tests.yaml
@@ -0,0 +1,6 @@
+tasks:
+- s3tests:
+    client.0:
+      sts_tests: True
+      webidentity_tests: True
+      rgw_server: client.0
diff --git a/qa/suites/rgw/sts/tasks/first.yaml b/qa/suites/rgw/sts/tasks/first.yaml
deleted file mode 100644
index d15f53335d5f..000000000000
--- a/qa/suites/rgw/sts/tasks/first.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-tasks:
-- tox: [ client.0 ]
-- keycloak:
-    client.0:
-      keycloak_version: 11.0.0
-- s3tests:
-    client.0:
-      sts_tests: True
-      webidentity_tests: True
-      rgw_server: client.0
diff --git a/qa/suites/rgw/sts/tasks/ststests.yaml b/qa/suites/rgw/sts/tasks/ststests.yaml
deleted file mode 100644
index d40d7c3b37aa..000000000000
--- a/qa/suites/rgw/sts/tasks/ststests.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- s3tests:
-    client.0:
-      sts_tests: True
-      rgw_server: client.0