From ef2cdfdefab87ca0438b08caa67a75a0a29cbfed Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Tue, 21 Mar 2023 09:37:58 +0800 Subject: [PATCH] qa: introduce postmerge for fuse/kclient mounts Suggested by Patrick and this will check mounter's type. Fixes: https://tracker.ceph.com/issues/57591 Signed-off-by: Xiubo Li --- qa/cephfs/mount/fuse.yaml | 11 +++++++++++ qa/cephfs/mount/kclient/mount.yaml | 11 +++++++++++ .../mount/kclient/overrides/distro/stock/k-stock.yaml | 1 + .../kclient/overrides/distro/testing/k-testing.yaml | 1 + qa/distros/all/centos.yaml | 1 + qa/distros/all/centos_6.3.yaml | 1 + qa/distros/all/centos_6.4.yaml | 1 + qa/distros/all/centos_6.5.yaml | 1 + qa/distros/all/centos_7.0.yaml | 1 + qa/distros/all/centos_7.1.yaml | 1 + qa/distros/all/centos_7.2.yaml | 1 + qa/distros/all/centos_7.3.yaml | 1 + qa/distros/all/centos_7.4.yaml | 1 + qa/distros/all/centos_7.5.yaml | 1 + qa/distros/all/centos_7.6.yaml | 1 + qa/distros/all/centos_8.0.yaml | 1 + qa/distros/all/centos_8.1.yaml | 1 + qa/distros/all/centos_8.2.yaml | 1 + qa/distros/all/centos_8.3.yaml | 1 + qa/distros/all/centos_8.stream.yaml | 1 + qa/distros/all/debian_6.0.yaml | 1 + qa/distros/all/debian_7.0.yaml | 1 + qa/distros/all/debian_8.0.yaml | 1 + qa/distros/all/fedora_17.yaml | 1 + qa/distros/all/fedora_18.yaml | 1 + qa/distros/all/fedora_19.yaml | 1 + qa/distros/all/opensuse_15.1.yaml | 1 + qa/distros/all/opensuse_15.2.yaml | 1 + qa/distros/all/opensuse_42.3.yaml | 1 + qa/distros/all/rhel_6.3.yaml | 1 + qa/distros/all/rhel_6.4.yaml | 1 + qa/distros/all/rhel_6.5.yaml | 1 + qa/distros/all/rhel_7.0.yaml | 1 + qa/distros/all/rhel_7.5.yaml | 1 + qa/distros/all/rhel_7.6.yaml | 1 + qa/distros/all/rhel_7.7.yaml | 1 + qa/distros/all/rhel_8.0.yaml | 1 + qa/distros/all/rhel_8.1.yaml | 1 + qa/distros/all/rhel_8.3.yaml | 1 + qa/distros/all/rhel_8.4.yaml | 1 + qa/distros/all/rhel_8.5.yaml | 1 + qa/distros/all/rhel_8.6.yaml | 1 + qa/distros/all/sle_12.2.yaml | 1 + qa/distros/all/sle_12.3.yaml | 1 + qa/distros/all/sle_15.1.yaml | 1 + qa/distros/all/sle_15.2.yaml | 1 + qa/distros/all/ubuntu_12.04.yaml | 1 + qa/distros/all/ubuntu_12.10.yaml | 1 + qa/distros/all/ubuntu_14.04.yaml | 1 + qa/distros/all/ubuntu_14.04_aarch64.yaml | 1 + qa/distros/all/ubuntu_14.04_i686.yaml | 1 + qa/distros/all/ubuntu_16.04.yaml | 1 + qa/distros/all/ubuntu_18.04.yaml | 1 + qa/distros/all/ubuntu_20.04.yaml | 1 + qa/distros/all/ubuntu_22.04.yaml | 1 + 55 files changed, 75 insertions(+) diff --git a/qa/cephfs/mount/fuse.yaml b/qa/cephfs/mount/fuse.yaml index 8338cc4933e06..ce8e4e2d72e53 100644 --- a/qa/cephfs/mount/fuse.yaml +++ b/qa/cephfs/mount/fuse.yaml @@ -1,2 +1,13 @@ +teuthology: + postmerge: + - local function is_kupstream() + return false + end + - local function is_kdistro() + return false + end + - local function is_fuse() + return true + end tasks: - ceph-fuse: diff --git a/qa/cephfs/mount/kclient/mount.yaml b/qa/cephfs/mount/kclient/mount.yaml index c9a1f5b6f2359..87bc8ddf9c695 100644 --- a/qa/cephfs/mount/kclient/mount.yaml +++ b/qa/cephfs/mount/kclient/mount.yaml @@ -1,2 +1,13 @@ +teuthology: + postmerge: + - local function is_kupstream() + return yaml.ktype == 'upstream' + end + - local function is_kdistro() + return yaml.ktype == 'distro' + end + - local function is_fuse() + return false + end tasks: - kclient: diff --git a/qa/cephfs/mount/kclient/overrides/distro/stock/k-stock.yaml b/qa/cephfs/mount/kclient/overrides/distro/stock/k-stock.yaml index 37d8890b4652e..ca2d688bb7af6 100644 --- a/qa/cephfs/mount/kclient/overrides/distro/stock/k-stock.yaml +++ b/qa/cephfs/mount/kclient/overrides/distro/stock/k-stock.yaml @@ -1,3 +1,4 @@ kernel: client: sha1: distro +ktype: distro diff --git a/qa/cephfs/mount/kclient/overrides/distro/testing/k-testing.yaml b/qa/cephfs/mount/kclient/overrides/distro/testing/k-testing.yaml index 21f83dbe29e06..2ee219125e7a7 100644 --- a/qa/cephfs/mount/kclient/overrides/distro/testing/k-testing.yaml +++ b/qa/cephfs/mount/kclient/overrides/distro/testing/k-testing.yaml @@ -1,3 +1,4 @@ kernel: client: branch: testing +ktype: upstream diff --git a/qa/distros/all/centos.yaml b/qa/distros/all/centos.yaml index 8f4854b95ac89..1efcfa192cb5d 100644 --- a/qa/distros/all/centos.yaml +++ b/qa/distros/all/centos.yaml @@ -1 +1,2 @@ os_type: centos +ktype: distro diff --git a/qa/distros/all/centos_6.3.yaml b/qa/distros/all/centos_6.3.yaml index 32187d6daf01e..ab441ebe41712 100644 --- a/qa/distros/all/centos_6.3.yaml +++ b/qa/distros/all/centos_6.3.yaml @@ -1,2 +1,3 @@ os_type: centos os_version: "6.3" +ktype: distro diff --git a/qa/distros/all/centos_6.4.yaml b/qa/distros/all/centos_6.4.yaml index 02383cd5f8c42..c0675434f0cc8 100644 --- a/qa/distros/all/centos_6.4.yaml +++ b/qa/distros/all/centos_6.4.yaml @@ -1,2 +1,3 @@ os_type: centos os_version: "6.4" +ktype: distro diff --git a/qa/distros/all/centos_6.5.yaml b/qa/distros/all/centos_6.5.yaml index 77c9e41f73e82..2500389ee3af3 100644 --- a/qa/distros/all/centos_6.5.yaml +++ b/qa/distros/all/centos_6.5.yaml @@ -1,2 +1,3 @@ os_type: centos os_version: "6.5" +ktype: distro diff --git a/qa/distros/all/centos_7.0.yaml b/qa/distros/all/centos_7.0.yaml index bccb286013e90..357b11f0d4291 100644 --- a/qa/distros/all/centos_7.0.yaml +++ b/qa/distros/all/centos_7.0.yaml @@ -1,2 +1,3 @@ os_type: centos os_version: "7.0" +ktype: distro diff --git a/qa/distros/all/centos_7.1.yaml b/qa/distros/all/centos_7.1.yaml index 74c68f96b5b61..022620d9e7336 100644 --- a/qa/distros/all/centos_7.1.yaml +++ b/qa/distros/all/centos_7.1.yaml @@ -1,2 +1,3 @@ os_type: centos os_version: "7.1" +ktype: distro diff --git a/qa/distros/all/centos_7.2.yaml b/qa/distros/all/centos_7.2.yaml index 44d2f0ec81f7a..9a918f855d678 100644 --- a/qa/distros/all/centos_7.2.yaml +++ b/qa/distros/all/centos_7.2.yaml @@ -1,2 +1,3 @@ os_type: centos os_version: "7.2" +ktype: distro diff --git a/qa/distros/all/centos_7.3.yaml b/qa/distros/all/centos_7.3.yaml index 9dfcc7f6bb114..e86cbb80d027b 100644 --- a/qa/distros/all/centos_7.3.yaml +++ b/qa/distros/all/centos_7.3.yaml @@ -1,2 +1,3 @@ os_type: centos os_version: "7.3" +ktype: distro diff --git a/qa/distros/all/centos_7.4.yaml b/qa/distros/all/centos_7.4.yaml index d06bc384b3fbd..3eb6896117550 100644 --- a/qa/distros/all/centos_7.4.yaml +++ b/qa/distros/all/centos_7.4.yaml @@ -1,2 +1,3 @@ os_type: centos os_version: "7.4" +ktype: distro diff --git a/qa/distros/all/centos_7.5.yaml b/qa/distros/all/centos_7.5.yaml index 54324576d75f0..2f067e46223fe 100644 --- a/qa/distros/all/centos_7.5.yaml +++ b/qa/distros/all/centos_7.5.yaml @@ -1,2 +1,3 @@ os_type: centos os_version: "7.5" +ktype: distro diff --git a/qa/distros/all/centos_7.6.yaml b/qa/distros/all/centos_7.6.yaml index 43e3d49cca689..81014e102f173 100644 --- a/qa/distros/all/centos_7.6.yaml +++ b/qa/distros/all/centos_7.6.yaml @@ -4,3 +4,4 @@ overrides: selinux: whitelist: - scontext=system_u:system_r:logrotate_t:s0 +ktype: distro diff --git a/qa/distros/all/centos_8.0.yaml b/qa/distros/all/centos_8.0.yaml index 4fbb41228d2d0..1679bf0d5580d 100644 --- a/qa/distros/all/centos_8.0.yaml +++ b/qa/distros/all/centos_8.0.yaml @@ -4,3 +4,4 @@ overrides: selinux: whitelist: - scontext=system_u:system_r:logrotate_t:s0 +ktype: distro diff --git a/qa/distros/all/centos_8.1.yaml b/qa/distros/all/centos_8.1.yaml index 24ae800744fe1..f764e507992b2 100644 --- a/qa/distros/all/centos_8.1.yaml +++ b/qa/distros/all/centos_8.1.yaml @@ -4,3 +4,4 @@ overrides: selinux: whitelist: - scontext=system_u:system_r:logrotate_t:s0 +ktype: distro diff --git a/qa/distros/all/centos_8.2.yaml b/qa/distros/all/centos_8.2.yaml index a2a899d716a40..1ccbd8abdba1d 100644 --- a/qa/distros/all/centos_8.2.yaml +++ b/qa/distros/all/centos_8.2.yaml @@ -4,3 +4,4 @@ overrides: selinux: whitelist: - scontext=system_u:system_r:logrotate_t:s0 +ktype: distro diff --git a/qa/distros/all/centos_8.3.yaml b/qa/distros/all/centos_8.3.yaml index 55ab1a48d2c9d..b9a7c2579a3a3 100644 --- a/qa/distros/all/centos_8.3.yaml +++ b/qa/distros/all/centos_8.3.yaml @@ -4,3 +4,4 @@ overrides: selinux: whitelist: - scontext=system_u:system_r:logrotate_t:s0 +ktype: distro diff --git a/qa/distros/all/centos_8.stream.yaml b/qa/distros/all/centos_8.stream.yaml index bf35997756618..5ae75c6bee3f3 100644 --- a/qa/distros/all/centos_8.stream.yaml +++ b/qa/distros/all/centos_8.stream.yaml @@ -4,3 +4,4 @@ overrides: selinux: whitelist: - scontext=system_u:system_r:logrotate_t:s0 +ktype: distro diff --git a/qa/distros/all/debian_6.0.yaml b/qa/distros/all/debian_6.0.yaml index 6820fa3c7027d..e0d6f51f82d16 100644 --- a/qa/distros/all/debian_6.0.yaml +++ b/qa/distros/all/debian_6.0.yaml @@ -1,2 +1,3 @@ os_type: debian os_version: "6.0" +ktype: distro diff --git a/qa/distros/all/debian_7.0.yaml b/qa/distros/all/debian_7.0.yaml index 8100dc41e3dc1..1eba6366dc433 100644 --- a/qa/distros/all/debian_7.0.yaml +++ b/qa/distros/all/debian_7.0.yaml @@ -1,2 +1,3 @@ os_type: debian os_version: "7.0" +ktype: distro diff --git a/qa/distros/all/debian_8.0.yaml b/qa/distros/all/debian_8.0.yaml index 300a4430e6bd5..48f9e44d4c663 100644 --- a/qa/distros/all/debian_8.0.yaml +++ b/qa/distros/all/debian_8.0.yaml @@ -1,2 +1,3 @@ os_type: debian os_version: "8.0" +ktype: distro diff --git a/qa/distros/all/fedora_17.yaml b/qa/distros/all/fedora_17.yaml index 801053af0ae01..4124a1c0af869 100644 --- a/qa/distros/all/fedora_17.yaml +++ b/qa/distros/all/fedora_17.yaml @@ -1,2 +1,3 @@ os_type: fedora os_version: "17" +ktype: distro diff --git a/qa/distros/all/fedora_18.yaml b/qa/distros/all/fedora_18.yaml index 07872aa7edfb9..7c87ae53ff24b 100644 --- a/qa/distros/all/fedora_18.yaml +++ b/qa/distros/all/fedora_18.yaml @@ -1,2 +1,3 @@ os_type: fedora os_version: "18" +ktype: distro diff --git a/qa/distros/all/fedora_19.yaml b/qa/distros/all/fedora_19.yaml index 5bac8aceea21d..5ee62d8612e45 100644 --- a/qa/distros/all/fedora_19.yaml +++ b/qa/distros/all/fedora_19.yaml @@ -1,2 +1,3 @@ os_type: fedora os_version: "19" +ktype: distro diff --git a/qa/distros/all/opensuse_15.1.yaml b/qa/distros/all/opensuse_15.1.yaml index 73b813623feed..05cb3d8e4285d 100644 --- a/qa/distros/all/opensuse_15.1.yaml +++ b/qa/distros/all/opensuse_15.1.yaml @@ -1,2 +1,3 @@ os_type: opensuse os_version: "15.1" +ktype: distro diff --git a/qa/distros/all/opensuse_15.2.yaml b/qa/distros/all/opensuse_15.2.yaml index c226953c11527..18ee83ba8f246 100644 --- a/qa/distros/all/opensuse_15.2.yaml +++ b/qa/distros/all/opensuse_15.2.yaml @@ -1,2 +1,3 @@ os_type: opensuse os_version: "15.2" +ktype: distro diff --git a/qa/distros/all/opensuse_42.3.yaml b/qa/distros/all/opensuse_42.3.yaml index 148ab7ac53f88..d3419fc95406a 100644 --- a/qa/distros/all/opensuse_42.3.yaml +++ b/qa/distros/all/opensuse_42.3.yaml @@ -1,2 +1,3 @@ os_type: opensuse os_version: "42.3" +ktype: distro diff --git a/qa/distros/all/rhel_6.3.yaml b/qa/distros/all/rhel_6.3.yaml index 6a8edcd562611..f9171354ff0d9 100644 --- a/qa/distros/all/rhel_6.3.yaml +++ b/qa/distros/all/rhel_6.3.yaml @@ -1,2 +1,3 @@ os_type: rhel os_version: "6.3" +ktype: distro diff --git a/qa/distros/all/rhel_6.4.yaml b/qa/distros/all/rhel_6.4.yaml index 5225495834aa4..5b250a32fc2a4 100644 --- a/qa/distros/all/rhel_6.4.yaml +++ b/qa/distros/all/rhel_6.4.yaml @@ -1,2 +1,3 @@ os_type: rhel os_version: "6.4" +ktype: distro diff --git a/qa/distros/all/rhel_6.5.yaml b/qa/distros/all/rhel_6.5.yaml index 7db54bea1bd28..6e9f7fe5caca1 100644 --- a/qa/distros/all/rhel_6.5.yaml +++ b/qa/distros/all/rhel_6.5.yaml @@ -1,2 +1,3 @@ os_type: rhel os_version: "6.5" +ktype: distro diff --git a/qa/distros/all/rhel_7.0.yaml b/qa/distros/all/rhel_7.0.yaml index c87c0bc135b70..36b6d42829a01 100644 --- a/qa/distros/all/rhel_7.0.yaml +++ b/qa/distros/all/rhel_7.0.yaml @@ -1,2 +1,3 @@ os_type: rhel os_version: "7.0" +ktype: distro diff --git a/qa/distros/all/rhel_7.5.yaml b/qa/distros/all/rhel_7.5.yaml index e5aaf3d30d3ba..6b1e60f808d79 100644 --- a/qa/distros/all/rhel_7.5.yaml +++ b/qa/distros/all/rhel_7.5.yaml @@ -1,2 +1,3 @@ os_type: rhel os_version: "7.5" +ktype: distro diff --git a/qa/distros/all/rhel_7.6.yaml b/qa/distros/all/rhel_7.6.yaml index 01742009d73b4..37bc0fb4a814d 100644 --- a/qa/distros/all/rhel_7.6.yaml +++ b/qa/distros/all/rhel_7.6.yaml @@ -4,3 +4,4 @@ overrides: selinux: whitelist: - scontext=system_u:system_r:logrotate_t:s0 +ktype: distro diff --git a/qa/distros/all/rhel_7.7.yaml b/qa/distros/all/rhel_7.7.yaml index f848d1788aaf4..ac44fe18e99d7 100644 --- a/qa/distros/all/rhel_7.7.yaml +++ b/qa/distros/all/rhel_7.7.yaml @@ -4,3 +4,4 @@ overrides: selinux: whitelist: - scontext=system_u:system_r:logrotate_t:s0 +ktype: distro diff --git a/qa/distros/all/rhel_8.0.yaml b/qa/distros/all/rhel_8.0.yaml index 215c34b7fd893..da6a33ed06192 100644 --- a/qa/distros/all/rhel_8.0.yaml +++ b/qa/distros/all/rhel_8.0.yaml @@ -4,3 +4,4 @@ overrides: selinux: whitelist: - scontext=system_u:system_r:logrotate_t:s0 +ktype: distro diff --git a/qa/distros/all/rhel_8.1.yaml b/qa/distros/all/rhel_8.1.yaml index 7f6b13b589cdd..c73893149dee9 100644 --- a/qa/distros/all/rhel_8.1.yaml +++ b/qa/distros/all/rhel_8.1.yaml @@ -4,3 +4,4 @@ overrides: selinux: whitelist: - scontext=system_u:system_r:logrotate_t:s0 +ktype: distro diff --git a/qa/distros/all/rhel_8.3.yaml b/qa/distros/all/rhel_8.3.yaml index c18c07b83fc3c..4e44bbff59c13 100644 --- a/qa/distros/all/rhel_8.3.yaml +++ b/qa/distros/all/rhel_8.3.yaml @@ -4,3 +4,4 @@ overrides: selinux: whitelist: - scontext=system_u:system_r:logrotate_t:s0 +ktype: distro diff --git a/qa/distros/all/rhel_8.4.yaml b/qa/distros/all/rhel_8.4.yaml index b0b74874f28ab..5a299ffc5396d 100644 --- a/qa/distros/all/rhel_8.4.yaml +++ b/qa/distros/all/rhel_8.4.yaml @@ -4,3 +4,4 @@ overrides: selinux: whitelist: - scontext=system_u:system_r:logrotate_t:s0 +ktype: distro diff --git a/qa/distros/all/rhel_8.5.yaml b/qa/distros/all/rhel_8.5.yaml index 12713a45e5a66..3e02bb1965bd4 100644 --- a/qa/distros/all/rhel_8.5.yaml +++ b/qa/distros/all/rhel_8.5.yaml @@ -4,3 +4,4 @@ overrides: selinux: whitelist: - scontext=system_u:system_r:logrotate_t:s0 +ktype: distro diff --git a/qa/distros/all/rhel_8.6.yaml b/qa/distros/all/rhel_8.6.yaml index 34c3f10bea354..1f9a6b73fda5e 100644 --- a/qa/distros/all/rhel_8.6.yaml +++ b/qa/distros/all/rhel_8.6.yaml @@ -4,3 +4,4 @@ overrides: selinux: whitelist: - scontext=system_u:system_r:logrotate_t:s0 +ktype: distro diff --git a/qa/distros/all/sle_12.2.yaml b/qa/distros/all/sle_12.2.yaml index 2a4a28c0b195d..720fc2dec3eb0 100644 --- a/qa/distros/all/sle_12.2.yaml +++ b/qa/distros/all/sle_12.2.yaml @@ -1,2 +1,3 @@ os_type: sle os_version: "12.2" +ktype: distro diff --git a/qa/distros/all/sle_12.3.yaml b/qa/distros/all/sle_12.3.yaml index 739113466f589..baab97ed756e5 100644 --- a/qa/distros/all/sle_12.3.yaml +++ b/qa/distros/all/sle_12.3.yaml @@ -1,2 +1,3 @@ os_type: sle os_version: "12.3" +ktype: distro diff --git a/qa/distros/all/sle_15.1.yaml b/qa/distros/all/sle_15.1.yaml index f795b56398015..e2fe5427f92f4 100644 --- a/qa/distros/all/sle_15.1.yaml +++ b/qa/distros/all/sle_15.1.yaml @@ -1,2 +1,3 @@ os_type: sle os_version: "15.1" +ktype: distro diff --git a/qa/distros/all/sle_15.2.yaml b/qa/distros/all/sle_15.2.yaml index 8e38373fb50a5..ccaac17992c6a 100644 --- a/qa/distros/all/sle_15.2.yaml +++ b/qa/distros/all/sle_15.2.yaml @@ -1,2 +1,3 @@ os_type: sle os_version: "15.2" +ktype: distro diff --git a/qa/distros/all/ubuntu_12.04.yaml b/qa/distros/all/ubuntu_12.04.yaml index dbc3a8d9c5879..c7d076defbdcf 100644 --- a/qa/distros/all/ubuntu_12.04.yaml +++ b/qa/distros/all/ubuntu_12.04.yaml @@ -1,2 +1,3 @@ os_type: ubuntu os_version: "12.04" +ktype: distro diff --git a/qa/distros/all/ubuntu_12.10.yaml b/qa/distros/all/ubuntu_12.10.yaml index ab655676e4c52..5b1c510a152b0 100644 --- a/qa/distros/all/ubuntu_12.10.yaml +++ b/qa/distros/all/ubuntu_12.10.yaml @@ -1,2 +1,3 @@ os_type: ubuntu os_version: "12.10" +ktype: distro diff --git a/qa/distros/all/ubuntu_14.04.yaml b/qa/distros/all/ubuntu_14.04.yaml index 309e989feebd3..3067dc0f78be5 100644 --- a/qa/distros/all/ubuntu_14.04.yaml +++ b/qa/distros/all/ubuntu_14.04.yaml @@ -1,2 +1,3 @@ os_type: ubuntu os_version: "14.04" +ktype: distro diff --git a/qa/distros/all/ubuntu_14.04_aarch64.yaml b/qa/distros/all/ubuntu_14.04_aarch64.yaml index 9dfbcb5102b0b..08ad4f50fdcb4 100644 --- a/qa/distros/all/ubuntu_14.04_aarch64.yaml +++ b/qa/distros/all/ubuntu_14.04_aarch64.yaml @@ -1,3 +1,4 @@ os_type: ubuntu os_version: "14.04" arch: aarch64 +ktype: distro diff --git a/qa/distros/all/ubuntu_14.04_i686.yaml b/qa/distros/all/ubuntu_14.04_i686.yaml index 4a0652e73b5a4..905391e1b3222 100644 --- a/qa/distros/all/ubuntu_14.04_i686.yaml +++ b/qa/distros/all/ubuntu_14.04_i686.yaml @@ -1,3 +1,4 @@ os_type: ubuntu os_version: "14.04" arch: i686 +ktype: distro diff --git a/qa/distros/all/ubuntu_16.04.yaml b/qa/distros/all/ubuntu_16.04.yaml index a459fddffb28e..7a55a7735aea2 100644 --- a/qa/distros/all/ubuntu_16.04.yaml +++ b/qa/distros/all/ubuntu_16.04.yaml @@ -1,2 +1,3 @@ os_type: ubuntu os_version: "16.04" +ktype: distro diff --git a/qa/distros/all/ubuntu_18.04.yaml b/qa/distros/all/ubuntu_18.04.yaml index 4d4464884a7de..3a89b202d81cf 100644 --- a/qa/distros/all/ubuntu_18.04.yaml +++ b/qa/distros/all/ubuntu_18.04.yaml @@ -1,2 +1,3 @@ os_type: ubuntu os_version: "18.04" +ktype: distro diff --git a/qa/distros/all/ubuntu_20.04.yaml b/qa/distros/all/ubuntu_20.04.yaml index f2039823003f2..f9fb375adf5a5 100644 --- a/qa/distros/all/ubuntu_20.04.yaml +++ b/qa/distros/all/ubuntu_20.04.yaml @@ -1,2 +1,3 @@ os_type: ubuntu os_version: "20.04" +ktype: distro diff --git a/qa/distros/all/ubuntu_22.04.yaml b/qa/distros/all/ubuntu_22.04.yaml index 6ff18baefb097..a34ddad11d4f3 100644 --- a/qa/distros/all/ubuntu_22.04.yaml +++ b/qa/distros/all/ubuntu_22.04.yaml @@ -1,2 +1,3 @@ os_type: ubuntu os_version: "22.04" +ktype: distro -- 2.39.5