qa/suites/rados/cephadm: fix conflicts, missing .qa link

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/suites/rados/cephadm-smoke/distro/ubuntu_18.04_podman.yaml b/qa/suites/rados/cephadm-smoke/distro/ubuntu_18.04_podman.yaml
deleted file mode 100644 (file)
index 6126bb2..0000000
--- a/qa/suites/rados/cephadm-smoke/distro/ubuntu_18.04_podman.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-os_type: ubuntu
-os_version: "18.04"
-
-# feel free to remove this test, if ppa:projectatomic is no longer maintained.
-tasks:
-- exec:
-    all:
-    - sudo apt -y install software-properties-common
-    - sudo add-apt-repository -y ppa:projectatomic/ppa
-    - sudo apt -y install podman

diff --git a/qa/suites/rados/cephadm/.qa b/qa/suites/rados/cephadm/.qa
new file mode 120000 (symlink)
index 0000000..fea2489
--- /dev/null
+++ b/qa/suites/rados/cephadm/.qa
@@ -0,0 +1 @@
+../.qa
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/distro/ubuntu_18.04_podman.yaml b/qa/suites/rados/cephadm/distro/ubuntu_18.04_podman.yaml
deleted file mode 100644 (file)
index 6126bb2..0000000
--- a/qa/suites/rados/cephadm/distro/ubuntu_18.04_podman.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-os_type: ubuntu
-os_version: "18.04"
-
-# feel free to remove this test, if ppa:projectatomic is no longer maintained.
-tasks:
-- exec:
-    all:
-    - sudo apt -y install software-properties-common
-    - sudo add-apt-repository -y ppa:projectatomic/ppa
-    - sudo apt -y install podman

diff --git a/qa/suites/rados/cephadm/smoke/distro/ubuntu_18.04_podman.yaml b/qa/suites/rados/cephadm/smoke/distro/ubuntu_18.04_podman.yaml
new file mode 100644 (file)
index 0000000..6126bb2
--- /dev/null
+++ b/qa/suites/rados/cephadm/smoke/distro/ubuntu_18.04_podman.yaml
@@ -0,0 +1,10 @@
+os_type: ubuntu
+os_version: "18.04"
+
+# feel free to remove this test, if ppa:projectatomic is no longer maintained.
+tasks:
+- exec:
+    all:
+    - sudo apt -y install software-properties-common
+    - sudo add-apt-repository -y ppa:projectatomic/ppa
+    - sudo apt -y install podman

diff --git a/qa/suites/rados/cephadm/with-work/distro/ubuntu_18.04_podman.yaml b/qa/suites/rados/cephadm/with-work/distro/ubuntu_18.04_podman.yaml
new file mode 100644 (file)
index 0000000..6126bb2
--- /dev/null
+++ b/qa/suites/rados/cephadm/with-work/distro/ubuntu_18.04_podman.yaml
@@ -0,0 +1,10 @@
+os_type: ubuntu
+os_version: "18.04"
+
+# feel free to remove this test, if ppa:projectatomic is no longer maintained.
+tasks:
+- exec:
+    all:
+    - sudo apt -y install software-properties-common
+    - sudo add-apt-repository -y ppa:projectatomic/ppa
+    - sudo apt -y install podman

diff --git a/qa/suites/rados/cephadm/with-work/tasks/rados_api_tests.yaml b/qa/suites/rados/cephadm/with-work/tasks/rados_api_tests.yaml
index 72299dabbf275c705343fb0439a11cc5e9fb0b20..c771070987de3c2695bfa9cdfc27b54e82e39ce0 120000 (symlink)
--- a/qa/suites/rados/cephadm/with-work/tasks/rados_api_tests.yaml
+++ b/qa/suites/rados/cephadm/with-work/tasks/rados_api_tests.yaml
@@ -1 +1 @@
-../../basic/tasks/rados_api_tests.yaml
\ No newline at end of file
+../../../basic/tasks/rados_api_tests.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/with-work/tasks/rados_python.yaml b/qa/suites/rados/cephadm/with-work/tasks/rados_python.yaml
index f989c79b3ac8a28b19b305dc5df24a5d908f3a0d..31ac6eadb737ea90b3d015d95ddfa86003e718ed 120000 (symlink)
--- a/qa/suites/rados/cephadm/with-work/tasks/rados_python.yaml
+++ b/qa/suites/rados/cephadm/with-work/tasks/rados_python.yaml
@@ -1 +1 @@
-../../basic/tasks/rados_python.yaml
\ No newline at end of file
+../../../basic/tasks/rados_python.yaml
\ No newline at end of file

diff --git a/qa/suites/rados/cephadm/workunits/distro/ubuntu_18.04_podman.yaml b/qa/suites/rados/cephadm/workunits/distro/ubuntu_18.04_podman.yaml
new file mode 100644 (file)
index 0000000..6126bb2
--- /dev/null
+++ b/qa/suites/rados/cephadm/workunits/distro/ubuntu_18.04_podman.yaml
@@ -0,0 +1,10 @@
+os_type: ubuntu
+os_version: "18.04"
+
+# feel free to remove this test, if ppa:projectatomic is no longer maintained.
+tasks:
+- exec:
+    all:
+    - sudo apt -y install software-properties-common
+    - sudo add-apt-repository -y ppa:projectatomic/ppa
+    - sudo apt -y install podman

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