Skip to content

Commit baf11d7

Browse files
committed
Merge PR ceph#57991 into main
* refs/pull/57991/head: qa: upgrade sub-suite upgraded_client from from n-1|n-2 releases qa: upgrade sub-suite nofs from n-1 and n-2 releases qa: use supported releases for featureful_client Reviewed-by: Leonid Usov <[email protected]>
2 parents 8867303 + 7658965 commit baf11d7

File tree

27 files changed

+274
-56
lines changed

27 files changed

+274
-56
lines changed

qa/suites/fs/upgrade/featureful_client/old_client/centos_8.stream.yaml

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.qa/distros/podman/centos_9.stream.yaml

qa/suites/fs/upgrade/nofs/tasks/0-pacific.yaml renamed to qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/reef.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
meta:
22
- desc: |
3-
install ceph/pacific latest
3+
install ceph/reef latest
44
tasks:
55
- install:
6-
branch: pacific
6+
branch: reef
77
exclude_packages:
88
- librados3
99
- ceph-mgr-dashboard
@@ -13,7 +13,7 @@ tasks:
1313
- cephadm
1414
- ceph-volume
1515
extra_packages: ['librados2']
16-
- print: "**** done installing pacific"
16+
- print: "**** done installing reef"
1717
- ceph:
1818
log-ignorelist:
1919
- overall HEALTH_
@@ -35,5 +35,5 @@ tasks:
3535
ms bind msgr2: false
3636
- exec:
3737
osd.0:
38-
- ceph osd set-require-min-compat-client pacific
38+
- ceph osd set-require-min-compat-client reef
3939
- print: "**** done ceph"

qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-octopus.yaml renamed to qa/suites/fs/upgrade/featureful_client/old_client/tasks/0-from/squid.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
meta:
22
- desc: |
3-
install ceph/octopus latest
3+
install ceph/squid latest
44
tasks:
55
- install:
6-
branch: octopus
6+
branch: squid
77
exclude_packages:
88
- librados3
99
- ceph-mgr-dashboard
@@ -13,7 +13,7 @@ tasks:
1313
- cephadm
1414
- ceph-volume
1515
extra_packages: ['librados2']
16-
- print: "**** done installing octopus"
16+
- print: "**** done installing squid"
1717
- ceph:
1818
log-ignorelist:
1919
- overall HEALTH_
@@ -35,5 +35,5 @@ tasks:
3535
ms bind msgr2: false
3636
- exec:
3737
osd.0:
38-
- ceph osd set-require-min-compat-client octopus
38+
- ceph osd set-require-min-compat-client squid
3939
- print: "**** done ceph"

qa/suites/fs/upgrade/featureful_client/old_client/tasks/1-client.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
tasks:
22
- ceph-fuse:
3-
- print: "**** done octopus client"
3+
client.0:
4+
client_feature_range: "[0-13],[15-21]"
5+
client.1:
6+
client_feature_range: "[0-13],[15-21]"
7+
- print: "**** done client"
48
- workunit:
59
clients:
610
all:

qa/suites/fs/upgrade/featureful_client/old_client/tasks/2-upgrade.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ tasks:
2222
- install.upgrade:
2323
# upgrade the single cluster node, which is running all the mon/mds/osd/mgr daemons
2424
mon.a:
25-
branch: quincy
2625
- print: "**** done install.upgrade the host"
2726
- ceph.restart:
2827
daemons: [mon.*, mgr.*]
@@ -42,7 +41,7 @@ tasks:
4241
mon.a:
4342
- ceph osd dump -f json-pretty
4443
- ceph versions
45-
- ceph osd require-osd-release quincy
44+
- ceph osd require-osd-release squid
4645
- for f in `ceph osd pool ls` ; do ceph osd pool set $f pg_autoscale_mode off ; done
4746
- ceph.healthy:
4847
- print: "**** done ceph.restart"

qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/quincy.yaml renamed to qa/suites/fs/upgrade/featureful_client/old_client/tasks/3-compat_client/yes.yaml

File renamed without changes.

qa/suites/fs/upgrade/featureful_client/upgraded_client/centos_8.stream.yaml

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.qa/distros/podman/centos_9.stream.yaml

qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-octopus.yaml renamed to qa/suites/fs/upgrade/featureful_client/upgraded_client/tasks/0-from/reef.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
meta:
22
- desc: |
3-
install ceph/octopus latest
3+
install ceph/reef latest
44
tasks:
55
- install:
6-
branch: octopus
6+
branch: reef
77
exclude_packages:
88
- librados3
99
- ceph-mgr-dashboard
@@ -13,7 +13,7 @@ tasks:
1313
- cephadm
1414
- ceph-volume
1515
extra_packages: ['librados2']
16-
- print: "**** done installing octopus"
16+
- print: "**** done installing reef"
1717
- ceph:
1818
log-ignorelist:
1919
- overall HEALTH_
@@ -35,5 +35,5 @@ tasks:
3535
ms bind msgr2: false
3636
- exec:
3737
osd.0:
38-
- ceph osd set-require-min-compat-client octopus
38+
- ceph osd set-require-min-compat-client reef
3939
- print: "**** done ceph"

0 commit comments

Comments
 (0)