Skip to content

Commit 579510d

Browse files
authored
Merge pull request ceph#48183 from lxbsz/wip-57591
qa: enable kclient test for newop test
2 parents cec15a5 + 898316a commit 579510d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+113
-7
lines changed

qa/cephfs/mount/fuse.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,16 @@
1+
teuthology:
2+
postmerge:
3+
- local function is_kupstream()
4+
return false
5+
end
6+
- local function is_kdistro()
7+
return false
8+
end
9+
- local function is_fuse()
10+
return true
11+
end
12+
- local function syntax_version()
13+
return ''
14+
end
115
tasks:
216
- ceph-fuse:

qa/cephfs/mount/kclient/mount.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,16 @@
1+
teuthology:
2+
postmerge:
3+
- local function is_kupstream()
4+
return yaml.ktype == 'upstream'
5+
end
6+
- local function is_kdistro()
7+
return yaml.ktype == 'distro'
8+
end
9+
- local function is_fuse()
10+
return false
11+
end
12+
- local function syntax_version()
13+
return yaml.overrides.kclient.syntax
14+
end
115
tasks:
216
- kclient:
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
kernel:
22
client:
33
sha1: distro
4+
ktype: distro
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
kernel:
22
client:
33
branch: testing
4+
ktype: upstream

qa/distros/all/centos.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
os_type: centos
2+
ktype: distro

qa/distros/all/centos_6.3.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
os_type: centos
22
os_version: "6.3"
3+
ktype: distro

qa/distros/all/centos_6.4.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
os_type: centos
22
os_version: "6.4"
3+
ktype: distro

qa/distros/all/centos_6.5.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
os_type: centos
22
os_version: "6.5"
3+
ktype: distro

qa/distros/all/centos_7.0.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
os_type: centos
22
os_version: "7.0"
3+
ktype: distro

qa/distros/all/centos_7.1.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
os_type: centos
22
os_version: "7.1"
3+
ktype: distro

0 commit comments

Comments
 (0)