From: Sage Weil <sage@redhat.com>
Date: Fri, 7 Feb 2020 22:19:08 +0000 (-0600)
Subject: qa/suites/rados/cephadm: fix conflicts, missing .qa link
X-Git-Tag: v15.1.1~504^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5dd8834c4aeec1c1b35fe3b344eda4d80e76f97e;p=ceph.git

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
index 6126bb24eb24..000000000000
--- 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
index 000000000000..fea2489fdf6d
--- /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
index 6126bb24eb24..000000000000
--- 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
index 000000000000..6126bb24eb24
--- /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
index 000000000000..6126bb24eb24
--- /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 72299dabbf27..c771070987de 120000
--- 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 f989c79b3ac8..31ac6eadb737 120000
--- 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
index 000000000000..6126bb24eb24
--- /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
index a602a0353e75..000000000000
--- a/qa/suites/rados/singleton-flat/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file