summaryrefslogtreecommitdiffstats
path: root/qa/suites/fs/upgrade
diff options
context:
space:
mode:
Diffstat (limited to 'qa/suites/fs/upgrade')
l---------qa/suites/fs/upgrade/featureful_client/old_client/centos_8.stream.yaml1
l---------qa/suites/fs/upgrade/featureful_client/old_client/centos_8.yaml1
l---------qa/suites/fs/upgrade/featureful_client/old_client/centos_9.stream.yaml1
-rw-r--r--qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/quincy.yaml (renamed from qa/suites/fs/upgrade/nofs/tasks/0-pacific.yaml)8
-rw-r--r--qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml6
-rw-r--r--qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml3
-rw-r--r--qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/yes.yaml (renamed from qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/quincy.yaml)0
l---------qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_8.stream.yaml1
l---------qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_8.yaml1
l---------qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_9.stream.yaml1
-rw-r--r--qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-from/quincy.yaml (renamed from qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-octopus.yaml)8
-rw-r--r--qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/1-client.yaml12
-rw-r--r--qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml3
-rw-r--r--qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/3-client-upgrade.yaml1
l---------qa/suites/fs/upgrade/mds_upgrade_sequence/centos_8.stream_container_tools.yaml1
l---------qa/suites/fs/upgrade/mds_upgrade_sequence/centos_9.stream.yaml1
l---------qa/suites/fs/upgrade/nofs/centos_8.stream.yaml1
l---------qa/suites/fs/upgrade/nofs/centos_8.yaml1
l---------qa/suites/fs/upgrade/nofs/centos_9.stream.yaml1
-rw-r--r--qa/suites/fs/upgrade/nofs/tasks/0-from/quincy.yaml (renamed from qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-octopus.yaml)8
-rw-r--r--qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml2
l---------qa/suites/fs/upgrade/upgraded_client/centos_8.stream.yaml1
l---------qa/suites/fs/upgrade/upgraded_client/centos_8.yaml1
l---------qa/suites/fs/upgrade/upgraded_client/centos_9.stream.yaml1
-rw-r--r--qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml53
-rw-r--r--qa/suites/fs/upgrade/upgraded_client/tasks/0-install/quincy.yaml (renamed from qa/suites/fs/upgrade/upgraded_client/tasks/0-from/pacific.yaml)10
-rw-r--r--qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/fuse-upgrade.yaml (renamed from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml)3
-rw-r--r--qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/kclient.yaml (renamed from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/kclient.yaml)0
l---------qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa1
-rw-r--r--qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/%0
l---------qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa1
-rw-r--r--qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml14
l---------qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/.qa1
l---------qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/.qa1
-rw-r--r--qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/% (renamed from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/%)0
-rw-r--r--qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/newops.yaml (renamed from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/1-client-sanity.yaml)0
l---------qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/.qa1
l---------qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/blogbench.yaml (renamed from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/blogbench.yaml)0
l---------qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/dbench.yaml (renamed from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/dbench.yaml)0
l---------qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/fsstress.yaml (renamed from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/fsstress.yaml)0
l---------qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/iozone.yaml (renamed from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/iozone.yaml)0
l---------qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/kernel_untar_build.yaml (renamed from qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/kernel_untar_build.yaml)0
42 files changed, 45 insertions, 105 deletions
diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/centos_8.stream.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/centos_8.stream.yaml
new file mode 120000
index 000000000..e787191b5
--- /dev/null
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/centos_8.stream.yaml
@@ -0,0 +1 @@
+.qa/distros/all/centos_8.stream.yaml \ No newline at end of file
diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/centos_8.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/centos_8.yaml
deleted file mode 120000
index 5dceec7e2..000000000
--- a/qa/suites/fs/upgrade/featureful_client/old_client/centos_8.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported/centos_8.stream.yaml \ No newline at end of file
diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/centos_9.stream.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/centos_9.stream.yaml
new file mode 120000
index 000000000..dc442c241
--- /dev/null
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/centos_9.stream.yaml
@@ -0,0 +1 @@
+.qa/distros/all/centos_9.stream.yaml \ No newline at end of file
diff --git a/qa/suites/fs/upgrade/nofs/tasks/0-pacific.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/quincy.yaml
index b74accc69..7d3611649 100644
--- a/qa/suites/fs/upgrade/nofs/tasks/0-pacific.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/quincy.yaml
@@ -1,9 +1,9 @@
meta:
- desc: |
- install ceph/pacific latest
+ install ceph/quincy latest
tasks:
- install:
- branch: pacific
+ branch: quincy
exclude_packages:
- librados3
- ceph-mgr-dashboard
@@ -13,7 +13,7 @@ tasks:
- cephadm
- ceph-volume
extra_packages: ['librados2']
-- print: "**** done installing pacific"
+- print: "**** done installing quincy"
- ceph:
log-ignorelist:
- overall HEALTH_
@@ -35,5 +35,5 @@ tasks:
ms bind msgr2: false
- exec:
osd.0:
- - ceph osd set-require-min-compat-client pacific
+ - ceph osd set-require-min-compat-client quincy
- print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml
index 976d6e265..f545d8bfa 100644
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml
@@ -1,6 +1,10 @@
tasks:
- ceph-fuse:
-- print: "**** done octopus client"
+ client.0:
+ client_feature_range: "[0-13],[15-21]"
+ client.1:
+ client_feature_range: "[0-13],[15-21]"
+- print: "**** done client"
- workunit:
clients:
all:
diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
index 26c185946..928c40d20 100644
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml
@@ -22,7 +22,6 @@ tasks:
- install.upgrade:
# upgrade the single cluster node, which is running all the mon/mds/osd/mgr daemons
mon.a:
- branch: quincy
- print: "**** done install.upgrade the host"
- ceph.restart:
daemons: [mon.*, mgr.*]
@@ -42,7 +41,7 @@ tasks:
mon.a:
- ceph osd dump -f json-pretty
- ceph versions
- - ceph osd require-osd-release quincy
+ - ceph osd require-osd-release reef
- for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
- ceph.healthy:
- print: "**** done ceph.restart"
diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/quincy.yaml b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/yes.yaml
index 138d8f4e2..138d8f4e2 100644
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/quincy.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/yes.yaml
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_8.stream.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_8.stream.yaml
new file mode 120000
index 000000000..e787191b5
--- /dev/null
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_8.stream.yaml
@@ -0,0 +1 @@
+.qa/distros/all/centos_8.stream.yaml \ No newline at end of file
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_8.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_8.yaml
deleted file mode 120000
index 5dceec7e2..000000000
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_8.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported/centos_8.stream.yaml \ No newline at end of file
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_9.stream.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_9.stream.yaml
new file mode 120000
index 000000000..dc442c241
--- /dev/null
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_9.stream.yaml
@@ -0,0 +1 @@
+.qa/distros/all/centos_9.stream.yaml \ No newline at end of file
diff --git a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-octopus.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-from/quincy.yaml
index e7774423f..7d3611649 100644
--- a/qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-octopus.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-from/quincy.yaml
@@ -1,9 +1,9 @@
meta:
- desc: |
- install ceph/octopus latest
+ install ceph/quincy latest
tasks:
- install:
- branch: octopus
+ branch: quincy
exclude_packages:
- librados3
- ceph-mgr-dashboard
@@ -13,7 +13,7 @@ tasks:
- cephadm
- ceph-volume
extra_packages: ['librados2']
-- print: "**** done installing octopus"
+- print: "**** done installing quincy"
- ceph:
log-ignorelist:
- overall HEALTH_
@@ -35,5 +35,5 @@ tasks:
ms bind msgr2: false
- exec:
osd.0:
- - ceph osd set-require-min-compat-client octopus
+ - ceph osd set-require-min-compat-client quincy
- print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/1-client.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/1-client.yaml
index c9b4c046f..3485dd680 100644
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/1-client.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/1-client.yaml
@@ -3,9 +3,11 @@ overrides:
nuke-on-error: false
tasks:
- ceph-fuse:
-- print: "**** done octopus client"
-#- workunit:
-# clients:
-# all:
-# - suites/fsstress.sh
+ client.1:
+ client_feature_range: "[0-13],[15-21]"
+- print: "**** done client"
+- workunit:
+ clients:
+ all:
+ - suites/fsstress.sh
- print: "**** done fsstress"
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
index e5ea8b19c..c1d65d25c 100644
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/2-upgrade.yaml
@@ -22,7 +22,6 @@ tasks:
- install.upgrade:
# upgrade the single cluster node, which is running all the mon/mds/osd/mgr daemons
mon.a:
- branch: quincy
- print: "**** done install.upgrade the host"
- ceph.restart:
daemons: [mon.*, mgr.*]
@@ -42,7 +41,7 @@ tasks:
mon.a:
- ceph versions
- ceph osd dump -f json-pretty
- - ceph osd require-osd-release quincy
+ - ceph osd require-osd-release reef
- for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
- ceph.healthy:
- print: "**** done ceph.restart"
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/3-client-upgrade.yaml b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/3-client-upgrade.yaml
index 251c349ac..58fdfdbd8 100644
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/3-client-upgrade.yaml
+++ b/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/3-client-upgrade.yaml
@@ -1,7 +1,6 @@
tasks:
- install.upgrade:
client.0:
- branch: quincy
- print: "**** done install.upgrade on client.0"
- ceph-fuse:
client.0:
diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_8.stream_container_tools.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_8.stream_container_tools.yaml
deleted file mode 120000
index 7a86f967f..000000000
--- a/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_8.stream_container_tools.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/podman/centos_8.stream_container_tools.yaml \ No newline at end of file
diff --git a/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_9.stream.yaml b/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_9.stream.yaml
new file mode 120000
index 000000000..dc442c241
--- /dev/null
+++ b/qa/suites/fs/upgrade/mds_upgrade_sequence/centos_9.stream.yaml
@@ -0,0 +1 @@
+.qa/distros/all/centos_9.stream.yaml \ No newline at end of file
diff --git a/qa/suites/fs/upgrade/nofs/centos_8.stream.yaml b/qa/suites/fs/upgrade/nofs/centos_8.stream.yaml
new file mode 120000
index 000000000..e787191b5
--- /dev/null
+++ b/qa/suites/fs/upgrade/nofs/centos_8.stream.yaml
@@ -0,0 +1 @@
+.qa/distros/all/centos_8.stream.yaml \ No newline at end of file
diff --git a/qa/suites/fs/upgrade/nofs/centos_8.yaml b/qa/suites/fs/upgrade/nofs/centos_8.yaml
deleted file mode 120000
index 5dceec7e2..000000000
--- a/qa/suites/fs/upgrade/nofs/centos_8.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported/centos_8.stream.yaml \ No newline at end of file
diff --git a/qa/suites/fs/upgrade/nofs/centos_9.stream.yaml b/qa/suites/fs/upgrade/nofs/centos_9.stream.yaml
new file mode 120000
index 000000000..dc442c241
--- /dev/null
+++ b/qa/suites/fs/upgrade/nofs/centos_9.stream.yaml
@@ -0,0 +1 @@
+.qa/distros/all/centos_9.stream.yaml \ No newline at end of file
diff --git a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-octopus.yaml b/qa/suites/fs/upgrade/nofs/tasks/0-from/quincy.yaml
index e7774423f..7d3611649 100644
--- a/qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-octopus.yaml
+++ b/qa/suites/fs/upgrade/nofs/tasks/0-from/quincy.yaml
@@ -1,9 +1,9 @@
meta:
- desc: |
- install ceph/octopus latest
+ install ceph/quincy latest
tasks:
- install:
- branch: octopus
+ branch: quincy
exclude_packages:
- librados3
- ceph-mgr-dashboard
@@ -13,7 +13,7 @@ tasks:
- cephadm
- ceph-volume
extra_packages: ['librados2']
-- print: "**** done installing octopus"
+- print: "**** done installing quincy"
- ceph:
log-ignorelist:
- overall HEALTH_
@@ -35,5 +35,5 @@ tasks:
ms bind msgr2: false
- exec:
osd.0:
- - ceph osd set-require-min-compat-client octopus
+ - ceph osd set-require-min-compat-client quincy
- print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml b/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml
index 858142871..253013000 100644
--- a/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml
+++ b/qa/suites/fs/upgrade/nofs/tasks/1-upgrade.yaml
@@ -38,7 +38,7 @@ tasks:
- ceph versions
- ceph osd dump -f json-pretty
- ceph fs dump
- - ceph osd require-osd-release quincy
+ - ceph osd require-osd-release reef
- for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
- ceph.healthy:
- print: "**** done ceph.restart"
diff --git a/qa/suites/fs/upgrade/upgraded_client/centos_8.stream.yaml b/qa/suites/fs/upgrade/upgraded_client/centos_8.stream.yaml
new file mode 120000
index 000000000..e787191b5
--- /dev/null
+++ b/qa/suites/fs/upgrade/upgraded_client/centos_8.stream.yaml
@@ -0,0 +1 @@
+.qa/distros/all/centos_8.stream.yaml \ No newline at end of file
diff --git a/qa/suites/fs/upgrade/upgraded_client/centos_8.yaml b/qa/suites/fs/upgrade/upgraded_client/centos_8.yaml
deleted file mode 120000
index 5dceec7e2..000000000
--- a/qa/suites/fs/upgrade/upgraded_client/centos_8.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported/centos_8.stream.yaml \ No newline at end of file
diff --git a/qa/suites/fs/upgrade/upgraded_client/centos_9.stream.yaml b/qa/suites/fs/upgrade/upgraded_client/centos_9.stream.yaml
new file mode 120000
index 000000000..dc442c241
--- /dev/null
+++ b/qa/suites/fs/upgrade/upgraded_client/centos_9.stream.yaml
@@ -0,0 +1 @@
+.qa/distros/all/centos_9.stream.yaml \ No newline at end of file
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml
deleted file mode 100644
index 02f541eaf..000000000
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/nautilus.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-meta:
-- desc: |
- install ceph/nautilus latest
-tasks:
-- install:
- branch: nautilus
- exclude_packages:
- - cephadm
- - ceph-mgr-cephadm
- - ceph-immutable-object-cache
- - python3-rados
- - python3-rgw
- - python3-rbd
- - python3-cephfs
- - ceph-volume
- extra_packages:
- - python-rados
- - python-rgw
- - python-rbd
- - python-cephfs
- # For kernel_untar_build workunit
- extra_system_packages:
- - bison
- - flex
- - elfutils-libelf-devel
- - openssl-devel
- - NetworkManager
- - iproute
- - util-linux
-- print: "**** done installing nautilus"
-- ceph:
- log-ignorelist:
- - overall HEALTH_
- - \(FS_
- - \(MDS_
- - \(OSD_
- - \(MON_DOWN\)
- - \(CACHE_POOL_
- - \(POOL_
- - \(MGR_DOWN\)
- - \(PG_
- - \(SMALLER_PGP_NUM\)
- - Monitor daemon marked osd
- - Behind on trimming
- - Manager daemon
- conf:
- global:
- mon warn on pool no app: false
- ms bind msgr2: false
-- exec:
- osd.0:
- - ceph osd set-require-min-compat-client nautilus
-- print: "**** done ceph"
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/pacific.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/quincy.yaml
index defb03922..356f87787 100644
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/0-from/pacific.yaml
+++ b/qa/suites/fs/upgrade/upgraded_client/tasks/0-install/quincy.yaml
@@ -1,9 +1,9 @@
meta:
- desc: |
- install ceph/pacific latest
+ install ceph/quincy latest
tasks:
- install:
- branch: pacific
+ branch: quincy
exclude_packages:
- cephadm
- ceph-mgr-cephadm
@@ -27,7 +27,7 @@ tasks:
- NetworkManager
- iproute
- util-linux
-- print: "**** done installing pacific"
+- print: "**** done installing quincy"
- ceph:
log-ignorelist:
- overall HEALTH_
@@ -49,5 +49,5 @@ tasks:
ms bind msgr2: false
- exec:
osd.0:
- - ceph osd set-require-min-compat-client pacific
-- print: "**** done ceph"
+ - ceph osd set-require-min-compat-client quincy
+- print: "**** done ceph" \ No newline at end of file
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/fuse-upgrade.yaml
index 34c85a00e..bed83610f 100644
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/fuse-upgrade.yaml
+++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/fuse-upgrade.yaml
@@ -9,6 +9,7 @@ tasks:
- install.upgrade:
client.0:
- print: "**** done install.upgrade on client.0"
+- ceph.healthy:
- ceph-fuse:
client.0:
-- print: "**** done remount client"
+- print: "**** done remount client.0"
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/kclient.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/kclient.yaml
index ecc705600..ecc705600 100644
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/0-clients/kclient.yaml
+++ b/qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/kclient.yaml
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa
deleted file mode 120000
index a602a0353..000000000
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/ \ No newline at end of file
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/% b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/%
deleted file mode 100644
index e69de29bb..000000000
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/%
+++ /dev/null
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa
deleted file mode 120000
index a602a0353..000000000
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/ \ No newline at end of file
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml
deleted file mode 100644
index 2d948af19..000000000
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/0-client-upgrade.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-teuthology:
- postmerge:
- - if not is_fuse() then reject() end
-tasks:
-- ceph-fuse:
- client.0:
- mounted: false
-- print: "**** done unmount client.0"
-- install.upgrade:
- client.0:
-- print: "**** done install.upgrade on client.0"
-- ceph-fuse:
- client.0:
-- print: "**** done remount client.0"
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/.qa
deleted file mode 120000
index a602a0353..000000000
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/ \ No newline at end of file
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/.qa
new file mode 120000
index 000000000..fea2489fd
--- /dev/null
+++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/.qa
@@ -0,0 +1 @@
+../.qa \ No newline at end of file
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/% b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/%
index e69de29bb..e69de29bb 100644
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/%
+++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/%
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/1-client-sanity.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/newops.yaml
index 9508cce65..9508cce65 100644
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/new_ops/1-client-sanity.yaml
+++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/new_ops/newops.yaml
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/.qa b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/.qa
new file mode 120000
index 000000000..fea2489fd
--- /dev/null
+++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/.qa
@@ -0,0 +1 @@
+../.qa \ No newline at end of file
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/blogbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/blogbench.yaml
index a2f8b3052..a2f8b3052 120000
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/blogbench.yaml
+++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/blogbench.yaml
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/dbench.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/dbench.yaml
index 9fb8adcea..9fb8adcea 120000
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/dbench.yaml
+++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/dbench.yaml
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/fsstress.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/fsstress.yaml
index dc777f36d..dc777f36d 120000
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/fsstress.yaml
+++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/fsstress.yaml
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/iozone.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/iozone.yaml
index f4d0ead4f..f4d0ead4f 120000
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/iozone.yaml
+++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/iozone.yaml
diff --git a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/kernel_untar_build.yaml b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/kernel_untar_build.yaml
index 317ebf8c4..317ebf8c4 120000
--- a/qa/suites/fs/upgrade/upgraded_client/tasks/2-workload/stress_tests/1-tests/kernel_untar_build.yaml
+++ b/qa/suites/fs/upgrade/upgraded_client/tasks/3-workload/stress_tests/kernel_untar_build.yaml