Skip to content

Commit 7658965

Browse files
dparmar18vshankar
authored andcommitted
qa: upgrade sub-suite upgraded_client from from n-1|n-2 releases
... and move to centos9. Fixes: https://tracker.ceph.com/issues/65580 Signed-off-by: Dhairya Parmar <[email protected]> Signed-off-by: Venky Shankar <[email protected]>
1 parent f00a69f commit 7658965

File tree

7 files changed

+61
-27
lines changed

7 files changed

+61
-27
lines changed

qa/suites/fs/upgrade/upgraded_client/branch/nautilus.yaml

Lines changed: 0 additions & 2 deletions
This file was deleted.

qa/suites/fs/upgrade/upgraded_client/branch/pacific.yaml

Lines changed: 0 additions & 2 deletions
This file was deleted.

qa/suites/fs/upgrade/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/upgraded_client/tasks/0-install.yaml renamed to qa/suites/fs/upgrade/upgraded_client/tasks/0-install/quincy.yaml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,9 @@
1-
teuthology:
2-
premerge: |
3-
local branch = yaml.teuthology.branch
4-
yaml_fragment['tasks'][0]['install']['branch'] = tostring(branch)
5-
print_branch = "**** done installing "..tostring(branch)
6-
yaml_fragment['tasks'][1]['print'] = print_branch
7-
local exec = yaml_fragment['tasks'][3]['exec']['osd.0']
8-
local set_compat = "ceph osd set-require-min-compat-client "..tostring(branch)
9-
py_attrgetter(exec).append(set_compat)
1+
meta:
2+
- desc: |
3+
install ceph/quincy latest
104
tasks:
115
- install:
12-
branch: []
6+
branch: quincy
137
exclude_packages:
148
- cephadm
159
- ceph-mgr-cephadm
@@ -33,7 +27,7 @@ tasks:
3327
- NetworkManager
3428
- iproute
3529
- util-linux
36-
- print: []
30+
- print: "**** done installing quincy"
3731
- ceph:
3832
log-ignorelist:
3933
- overall HEALTH_
@@ -54,5 +48,6 @@ tasks:
5448
mon warn on pool no app: false
5549
ms bind msgr2: false
5650
- exec:
57-
osd.0: []
51+
osd.0:
52+
- ceph osd set-require-min-compat-client quincy
5853
- print: "**** done ceph"
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
meta:
2+
- desc: |
3+
install ceph/reef latest
4+
tasks:
5+
- install:
6+
branch: reef
7+
exclude_packages:
8+
- cephadm
9+
- ceph-mgr-cephadm
10+
- ceph-immutable-object-cache
11+
- python3-rados
12+
- python3-rgw
13+
- python3-rbd
14+
- python3-cephfs
15+
- ceph-volume
16+
extra_packages:
17+
- python-rados
18+
- python-rgw
19+
- python-rbd
20+
- python-cephfs
21+
# For kernel_untar_build workunit
22+
extra_system_packages:
23+
- bison
24+
- flex
25+
- elfutils-libelf-devel
26+
- openssl-devel
27+
- NetworkManager
28+
- iproute
29+
- util-linux
30+
- print: "**** done installing reef"
31+
- ceph:
32+
log-ignorelist:
33+
- overall HEALTH_
34+
- \(FS_
35+
- \(MDS_
36+
- \(OSD_
37+
- \(MON_DOWN\)
38+
- \(CACHE_POOL_
39+
- \(POOL_
40+
- \(MGR_DOWN\)
41+
- \(PG_
42+
- \(SMALLER_PGP_NUM\)
43+
- Monitor daemon marked osd
44+
- Behind on trimming
45+
- Manager daemon
46+
conf:
47+
global:
48+
mon warn on pool no app: false
49+
ms bind msgr2: false
50+
- exec:
51+
osd.0:
52+
- ceph osd set-require-min-compat-client reef
53+
- print: "**** done ceph"

qa/suites/fs/upgrade/upgraded_client/tasks/2-clients/fuse-upgrade.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
11
teuthology:
2-
premerge: |
3-
local branch = yaml.teuthology.branch
4-
if tostring(branch) == "nautilus" then
5-
yaml_fragment['tasks'][2]['install.upgrade']['client.0']['branch'] = "pacific"
6-
elseif tostring(branch) == "pacific" then
7-
yaml_fragment['tasks'][2]['install.upgrade']['client.0']['branch'] = "reef"
8-
else
9-
error("invalid source branch")
10-
end
112
postmerge:
123
- if not is_fuse() then reject() end
134
tasks:
@@ -17,7 +8,6 @@ tasks:
178
- print: "**** done unmount client.0"
189
- install.upgrade:
1910
client.0:
20-
branch: []
2111
- print: "**** done install.upgrade on client.0"
2212
- ceph.healthy:
2313
- ceph-fuse:

0 commit comments

Comments
 (0)