Merge pull request ceph#44161 from neha-ojha/wip-fix-upgrades

qa/suites/upgrade/octopus-x: bunch of fixes and cleanup Reviewed-by: Yuri Weinstein <[email protected]> Reviewed-by: Sridhar Seshasayee <[email protected]>
guits · Dec 1, 2021 · cf829d0 · cf829d0
2 parents 4898706 + 80041e5
commit cf829d0
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 16 deletions.
diff --git a/...rasure-code-no-cephadm/1-nautilus-install → ...erasure-code-no-cephadm/1-octopus-install b/...rasure-code-no-cephadm/1-nautilus-install → ...erasure-code-no-cephadm/1-octopus-install
diff --git a/qa/suites/upgrade/octopus-x/stress-split-erasure-code-no-cephadm/6-pacific.yaml b/qa/suites/upgrade/octopus-x/stress-split-erasure-code-no-cephadm/6-pacific.yaml
diff --git a/qa/suites/upgrade/octopus-x/stress-split-erasure-code-no-cephadm/6-quincy.yaml b/qa/suites/upgrade/octopus-x/stress-split-erasure-code-no-cephadm/6-quincy.yaml
@@ -0,0 +1 @@
+.qa/releases/quincy.yaml
diff --git a/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/5-finish-upgrade.yaml b/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/5-finish-upgrade.yaml
@@ -12,11 +12,5 @@ tasks:
     daemons: [mon.c, osd.8, osd.9, osd.10, osd.11, rgw.*]
     wait-for-healthy: false
     wait-for-osds-up: true
-- print: "**** done restarted/upgrated => mon.c, osd.8, osd.9, osd.10, osd.11, rgw.*"
-- exec:
-    osd.0:
-      - ceph osd set pglog_hardlimit
-      - ceph osd dump --format=json-pretty | grep "flags"
-      - ceph config set global mon_warn_on_msgr2_not_enabled false
-- print: "**** done try to set pglog_hardlimit again, should succeed"
+- print: "**** done restarted/upgraded => mon.c, osd.8, osd.9, osd.10, osd.11, rgw.*"
 
diff --git a/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/6-pacific.yaml b/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/6-pacific.yaml
diff --git a/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/6-quincy.yaml b/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/6-quincy.yaml
@@ -0,0 +1 @@
+.qa/releases/quincy.yaml
diff --git a/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/7-msgr2.yaml b/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/7-msgr2.yaml
diff --git a/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/objectstore/bluestore-bitmap.yaml b/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/objectstore/bluestore-bitmap.yaml
diff --git a/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/objectstore/bluestore-hybrid.yaml b/qa/suites/upgrade/octopus-x/stress-split-no-cephadm/objectstore/bluestore-hybrid.yaml
@@ -0,0 +1 @@
+.qa/objectstore_debug/bluestore-hybrid.yaml