From: Sage Weil <sage@redhat.com>
Date: Fri, 7 Feb 2020 23:49:39 +0000 (-0600)
Subject: qa/suites/rados/cephadm: move ubuntu_18.04_podman to shared location
X-Git-Tag: v15.1.1~504^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=55518208ab6d93ccbe7a971f306f549e34b7741f;p=ceph.git

qa/suites/rados/cephadm: move ubuntu_18.04_podman to shared location

Also set the registries.conf file so we can pull from docker.io.

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

diff --git a/qa/distros/all/ubuntu_18.04_podman.yaml b/qa/distros/all/ubuntu_18.04_podman.yaml
new file mode 100644
index 000000000000..6bb83b2b0eb1
--- /dev/null
+++ b/qa/distros/all/ubuntu_18.04_podman.yaml
@@ -0,0 +1,11 @@
+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
+    - echo -e "[registries.search]\nregistries = ['docker.io']" | sudo tee /etc/containers/registries.conf
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/smoke/distro/ubuntu_18.04_podman.yaml b/qa/suites/rados/cephadm/smoke/distro/ubuntu_18.04_podman.yaml
new file mode 120000
index 000000000000..b948dd4343c9
--- /dev/null
+++ b/qa/suites/rados/cephadm/smoke/distro/ubuntu_18.04_podman.yaml
@@ -0,0 +1 @@
+.qa/distros/all/ubuntu_18.04_podman.yaml
\ No newline at end of file
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
deleted file mode 100644
index 6126bb24eb24..000000000000
--- a/qa/suites/rados/cephadm/with-work/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/with-work/distro/ubuntu_18.04_podman.yaml b/qa/suites/rados/cephadm/with-work/distro/ubuntu_18.04_podman.yaml
new file mode 120000
index 000000000000..b948dd4343c9
--- /dev/null
+++ b/qa/suites/rados/cephadm/with-work/distro/ubuntu_18.04_podman.yaml
@@ -0,0 +1 @@
+.qa/distros/all/ubuntu_18.04_podman.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
deleted file mode 100644
index 6126bb24eb24..000000000000
--- a/qa/suites/rados/cephadm/workunits/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/workunits/distro/ubuntu_18.04_podman.yaml b/qa/suites/rados/cephadm/workunits/distro/ubuntu_18.04_podman.yaml
new file mode 120000
index 000000000000..b948dd4343c9
--- /dev/null
+++ b/qa/suites/rados/cephadm/workunits/distro/ubuntu_18.04_podman.yaml
@@ -0,0 +1 @@
+.qa/distros/all/ubuntu_18.04_podman.yaml
\ No newline at end of file