Merge PR ceph#62439 into main

batrick · batrick · commit 4a25f99947fe · 2025-03-24T08:31:39.000-04:00
* refs/pull/62439/head:
	.github/workflows,script: add test for missing .qa links
	qa: add missing .qa links

Reviewed-by: Ernesto Puerta &lt;epuertat@redhat.com&gt;
diff --git a/.github/workflows/qa-symlink.yml b/.github/workflows/qa-symlink.yml
@@ -0,0 +1,17 @@
+---
+name: "Check for missing .qa links"
+on: [pull_request]
+
+jobs:
+  pull_request:
+    name: "Check for missing .qa links"
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout ceph.git
+        uses: actions/checkout@v4
+        with:
+          path: ceph
+
+      - name: verify .qa links
+        run: ./src/script/verify-qa
+        working-directory: ceph
diff --git a/qa/suites/crimson-rados/singleton/.qa b/qa/suites/crimson-rados/singleton/.qa
@@ -1 +1 @@
-../.qa
+../.qa/
diff --git a/qa/suites/crimson-rados/singleton/all/.qa b/qa/suites/crimson-rados/singleton/all/.qa
@@ -1 +1 @@
-../.qa
+../.qa/
diff --git a/qa/suites/crimson-rados/thrash_simple/objectstore/seastore/.qa b/qa/suites/crimson-rados/thrash_simple/objectstore/seastore/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/fs/fscrypt/clusters/.qa b/qa/suites/fs/fscrypt/clusters/.qa
@@ -1 +1 @@
-../.qa
+../.qa/
diff --git a/qa/suites/fs/fscrypt/tasks/1-tests/.qa b/qa/suites/fs/fscrypt/tasks/1-tests/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/fs/functional/tasks/test_snap_schedule/.qa b/qa/suites/fs/functional/tasks/test_snap_schedule/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/fs/functional/tasks/test_snap_schedule/overrides/.qa b/qa/suites/fs/functional/tasks/test_snap_schedule/overrides/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/.qa b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-from/.qa b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-from/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/fail_fs/.qa b/qa/suites/fs/upgrade/mds_upgrade_sequence/fail_fs/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/.qa b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/0-from/reef/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/2-client/.qa b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/2-client/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/.qa b/qa/suites/fs/upgrade/mds_upgrade_sequence/tasks/4-config-upgrade/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/fs/upgrade/nofs/tasks/0-from/.qa b/qa/suites/fs/upgrade/nofs/tasks/0-from/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/fs/upgrade/upgraded_client/clusters/.qa b/qa/suites/fs/upgrade/upgraded_client/clusters/.qa
@@ -1 +1 @@
-../.qa
+../.qa/
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/fs/workload/ranks/multi/.qa b/qa/suites/fs/workload/ranks/multi/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/fs/workload/ranks/multi/balancer/.qa b/qa/suites/fs/workload/ranks/multi/balancer/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/fs/workload/ranks/multi/n/.qa b/qa/suites/fs/workload/ranks/multi/n/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/fs/workload/ranks/multi/replication/.qa b/qa/suites/fs/workload/ranks/multi/replication/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/orch/cephadm/no-agent-workunits/task/.qa b/qa/suites/orch/cephadm/no-agent-workunits/task/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/orch/cephadm/smb/.qa b/qa/suites/orch/cephadm/smb/.qa
@@ -1 +1 @@
-../.qa
+../.qa/
diff --git a/qa/suites/orch/cephadm/smb/tasks/.qa b/qa/suites/orch/cephadm/smb/tasks/.qa
@@ -1 +1 @@
-../.qa
+../.qa/
diff --git a/qa/suites/orch/cephadm/smoke-small/0-distro/.qa b/qa/suites/orch/cephadm/smoke-small/0-distro/.qa
@@ -1 +1 @@
-../.qa
+../.qa/
diff --git a/qa/suites/rados/mgr/tasks/4-units/.qa b/qa/suites/rados/mgr/tasks/4-units/.qa
@@ -1 +1 @@
-../.qa
+../.qa/
diff --git a/qa/suites/rados/verify/read-affinity/.qa b/qa/suites/rados/verify/read-affinity/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/rgw/bucket-logging/tasks/.qa b/qa/suites/rgw/bucket-logging/tasks/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/rgw/cloud-transition/tasks/restore/.qa b/qa/suites/rgw/cloud-transition/tasks/restore/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/rgw/cloud-transition/tasks/transition/.qa b/qa/suites/rgw/cloud-transition/tasks/transition/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/rgw/lua/tasks/.qa b/qa/suites/rgw/lua/tasks/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/rgw/notifications/tasks/amqp/.qa b/qa/suites/rgw/notifications/tasks/amqp/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/rgw/notifications/tasks/http/.qa b/qa/suites/rgw/notifications/tasks/http/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/rgw/notifications/tasks/kafka/.qa b/qa/suites/rgw/notifications/tasks/kafka/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/rgw/notifications/tasks/kafka_failover/.qa b/qa/suites/rgw/notifications/tasks/kafka_failover/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/rgw/notifications/tasks/others/.qa b/qa/suites/rgw/notifications/tasks/others/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/rgw/sts/auth-order/.qa b/qa/suites/rgw/sts/auth-order/.qa
@@ -1 +1 @@
-../.qa
+../.qa/
diff --git a/qa/suites/rgw/tempest/tasks/s3/.qa b/qa/suites/rgw/tempest/tasks/s3/.qa
@@ -1 +1 @@
-../.qa
+../.qa/
diff --git a/qa/suites/rgw/tempest/tasks/s3/auth-order/.qa b/qa/suites/rgw/tempest/tasks/s3/auth-order/.qa
@@ -1 +1 @@
-../.qa
+../.qa/
diff --git a/qa/suites/rgw/upgrade/.qa b/qa/suites/rgw/upgrade/.qa
@@ -1 +1 @@
-../.qa
+../.qa/
diff --git a/qa/suites/rgw/upgrade/1-install/.qa b/qa/suites/rgw/upgrade/1-install/.qa
@@ -1 +1 @@
-../.qa
+../.qa/
diff --git a/qa/suites/rgw/upgrade/1-install/quincy/.qa b/qa/suites/rgw/upgrade/1-install/quincy/.qa
@@ -1 +1 @@
-../.qa
+../.qa/
diff --git a/qa/suites/rgw/upgrade/1-install/quincy/distro$/.qa b/qa/suites/rgw/upgrade/1-install/quincy/distro$/.qa
@@ -1 +1 @@
-../.qa
+../.qa/
diff --git a/qa/suites/rgw/upgrade/1-install/reef/.qa b/qa/suites/rgw/upgrade/1-install/reef/.qa
@@ -1 +1 @@
-../.qa
+../.qa/
diff --git a/qa/suites/rgw/upgrade/1-install/reef/distro$/.qa b/qa/suites/rgw/upgrade/1-install/reef/distro$/.qa
@@ -1 +1 @@
-../.qa
+../.qa/
diff --git a/qa/suites/rgw/upgrade/3-upgrade-sequence/.qa b/qa/suites/rgw/upgrade/3-upgrade-sequence/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/rgw/verify/accounts$/.qa b/qa/suites/rgw/verify/accounts$/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/rgw/verify/inline-data$/.qa b/qa/suites/rgw/verify/inline-data$/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/upgrade/reef-x/parallel/overrides/.qa b/qa/suites/upgrade/reef-x/parallel/overrides/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/upgrade/reef-x/stress-split/overrides/.qa b/qa/suites/upgrade/reef-x/stress-split/overrides/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/upgrade/squid-x/parallel/overrides/.qa b/qa/suites/upgrade/squid-x/parallel/overrides/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/upgrade/squid-x/stress-split/overrides/.qa b/qa/suites/upgrade/squid-x/stress-split/overrides/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/upgrade/telemetry-upgrade/.qa b/qa/suites/upgrade/telemetry-upgrade/.qa
@@ -0,0 +1 @@
+../.qa/
diff --git a/qa/suites/upgrade/telemetry-upgrade/reef-x/.qa b/qa/suites/upgrade/telemetry-upgrade/reef-x/.qa
@@ -1 +1 @@
-../../.qa
+../.qa/
diff --git a/qa/suites/upgrade/telemetry-upgrade/squid-x/.qa b/qa/suites/upgrade/telemetry-upgrade/squid-x/.qa
@@ -1 +1 @@
-../../.qa
+../.qa/
diff --git a/src/script/verify-qa b/src/script/verify-qa
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+find qa/suites/ -type d -execdir ln -sfT ../.qa/ {}/.qa \;
+
+git add '*.qa'
+
+DIFF=$(git diff --cached)
+
+if [ -z "$DIFF" ]; then
+  printf 'passed\n'
+  exit 0
+else
+  printf 'Please apply the following patch:\n\n%s\n' "$DIFF"
+  exit 1
+fi
