From: Sage Weil <sage@newdream.net>
Date: Thu, 4 Feb 2021 16:35:34 +0000 (-0600)
Subject: qa/suites/upgarde/octopus-x: rename yaml file
X-Git-Tag: v17.1.0~2933^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cd92661627c180b2121489d346758e6f82fa848c;p=ceph.git

qa/suites/upgarde/octopus-x: rename yaml file

We're installing octopus, not pacific

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/1-ceph-install/octopus.yaml b/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/1-ceph-install/octopus.yaml
new file mode 100644
index 000000000000..90a958412005
--- /dev/null
+++ b/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/1-ceph-install/octopus.yaml
@@ -0,0 +1,32 @@
+meta:
+- desc: install ceph/octopus latest
+tasks:
+- install:
+    exclude_packages:
+      - ceph-mgr-cephadm
+      - cephadm
+      - libcephfs-dev
+    branch: octopus
+- print: "**** done install octopus"
+- ceph:
+    conf:
+      global:
+        bluestore_warn_on_legacy_statfs: false
+        bluestore warn on no per pool omap: false
+        mon pg warn min per osd: 0
+    log-ignorelist:
+      - Not found or unloadable
+      - evicting unresponsive client
+- exec:
+    osd.0:
+      - ceph osd require-osd-release octopus
+      - ceph osd set-require-min-compat-client octopus
+- print: "**** done ceph"
+- rgw:
+   - client.0
+- print: "**** done => started rgw client.0"
+overrides:
+  ceph:
+    conf:
+      mon:
+        mon warn on osd down out interval zero: false
diff --git a/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/1-ceph-install/pacific.yaml b/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/1-ceph-install/pacific.yaml
deleted file mode 100644
index 90a958412005..000000000000
--- a/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/1-ceph-install/pacific.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-meta:
-- desc: install ceph/octopus latest
-tasks:
-- install:
-    exclude_packages:
-      - ceph-mgr-cephadm
-      - cephadm
-      - libcephfs-dev
-    branch: octopus
-- print: "**** done install octopus"
-- ceph:
-    conf:
-      global:
-        bluestore_warn_on_legacy_statfs: false
-        bluestore warn on no per pool omap: false
-        mon pg warn min per osd: 0
-    log-ignorelist:
-      - Not found or unloadable
-      - evicting unresponsive client
-- exec:
-    osd.0:
-      - ceph osd require-osd-release octopus
-      - ceph osd set-require-min-compat-client octopus
-- print: "**** done ceph"
-- rgw:
-   - client.0
-- print: "**** done => started rgw client.0"
-overrides:
-  ceph:
-    conf:
-      mon:
-        mon warn on osd down out interval zero: false