From: Casey Bodley <cbodley@redhat.com>
Date: Fri, 4 Oct 2024 14:51:01 +0000 (-0400)
Subject: qa/rgw/keystone: run s3tests against both auth orders
X-Git-Tag: v19.2.3~15^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0c4c3bad8603c3387ceed0034598a281ba6959eb;p=ceph.git

qa/rgw/keystone: run s3tests against both auth orders

we've only been testing the default configuration for
`rgw_s3_auth_order: sts, external, local`, but local before external
should work too. split the s3tests task into two jobs, one for each
auth order

relates to https://tracker.ceph.com/issues/68393

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 0601e565c5c98adf4946b8178e7e7b1efb52a207)
---

diff --git a/qa/suites/rgw/tempest/tasks/s3/% b/qa/suites/rgw/tempest/tasks/s3/%
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/rgw/tempest/tasks/s3/.qa b/qa/suites/rgw/tempest/tasks/s3/.qa
new file mode 120000
index 00000000000..fea2489fdf6
--- /dev/null
+++ b/qa/suites/rgw/tempest/tasks/s3/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/rgw/tempest/tasks/s3/auth-order/.qa b/qa/suites/rgw/tempest/tasks/s3/auth-order/.qa
new file mode 120000
index 00000000000..fea2489fdf6
--- /dev/null
+++ b/qa/suites/rgw/tempest/tasks/s3/auth-order/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file
diff --git a/qa/suites/rgw/tempest/tasks/s3/auth-order/external-local.yaml b/qa/suites/rgw/tempest/tasks/s3/auth-order/external-local.yaml
new file mode 100644
index 00000000000..c46a51e0958
--- /dev/null
+++ b/qa/suites/rgw/tempest/tasks/s3/auth-order/external-local.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rgw s3 auth order: sts, external, local
diff --git a/qa/suites/rgw/tempest/tasks/s3/auth-order/local-external.yaml b/qa/suites/rgw/tempest/tasks/s3/auth-order/local-external.yaml
new file mode 100644
index 00000000000..a7b00d00f0b
--- /dev/null
+++ b/qa/suites/rgw/tempest/tasks/s3/auth-order/local-external.yaml
@@ -0,0 +1,5 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rgw s3 auth order: sts, local, external
diff --git a/qa/suites/rgw/tempest/tasks/s3/s3tests.yaml b/qa/suites/rgw/tempest/tasks/s3/s3tests.yaml
new file mode 100644
index 00000000000..06f3f9d46bb
--- /dev/null
+++ b/qa/suites/rgw/tempest/tasks/s3/s3tests.yaml
@@ -0,0 +1,41 @@
+overrides:
+  ceph:
+    conf:
+      client:
+        rgw s3 auth use keystone: true
+        rgw crypt s3 kms backend: testing
+        rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo=
+        rgw crypt require ssl: false
+        rgw sts key: abcdefghijklmnop
+        rgw s3 auth use sts: true
+  keystone:
+    client.0:
+      projects:
+        - name: s3tests
+          description: s3tests project
+      users:
+        - name: s3tests-main
+          password: SECRET
+          project: s3tests
+      ec2 credentials:
+        - project: s3tests
+          user: s3tests-main
+      roles: [ name: member ]
+      role-mappings:
+        - name: member
+          user: s3tests-main
+          project: s3tests
+  s3tests:
+    accounts:
+      iam root: RGW88888888888888888
+      iam alt root: RGW99999999999999999
+
+tasks:
+- s3tests:
+    client.0:
+      rgw_server: client.0
+      keystone users:
+        s3 main:
+          client: client.0
+          project: s3tests
+          user: s3tests-main
diff --git a/qa/suites/rgw/tempest/tasks/s3tests.yaml b/qa/suites/rgw/tempest/tasks/s3tests.yaml
deleted file mode 100644
index 06f3f9d46bb..00000000000
--- a/qa/suites/rgw/tempest/tasks/s3tests.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      client:
-        rgw s3 auth use keystone: true
-        rgw crypt s3 kms backend: testing
-        rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= testkey-2=aWIKTWFrZWZpbGUKbWFuCm91dApzcmMKVGVzdGluZwo=
-        rgw crypt require ssl: false
-        rgw sts key: abcdefghijklmnop
-        rgw s3 auth use sts: true
-  keystone:
-    client.0:
-      projects:
-        - name: s3tests
-          description: s3tests project
-      users:
-        - name: s3tests-main
-          password: SECRET
-          project: s3tests
-      ec2 credentials:
-        - project: s3tests
-          user: s3tests-main
-      roles: [ name: member ]
-      role-mappings:
-        - name: member
-          user: s3tests-main
-          project: s3tests
-  s3tests:
-    accounts:
-      iam root: RGW88888888888888888
-      iam alt root: RGW99999999999999999
-
-tasks:
-- s3tests:
-    client.0:
-      rgw_server: client.0
-      keystone users:
-        s3 main:
-          client: client.0
-          project: s3tests
-          user: s3tests-main