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 <xiubli@redhat.com>

diff --git a/qa/cephfs/mount/fuse.yaml b/qa/cephfs/mount/fuse.yaml
index 8338cc4933e06dccc822417d04e7fcd3532d0c39..ce8e4e2d72e532548b799c554fbe27ac877d024b 100644 (file)
--- 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 c9a1f5b6f2359934cfd7bcde0c42bc94395d683d..87bc8ddf9c695c4e76029df99cb77b4807a86bef 100644 (file)
--- 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 37d8890b4652e0393d0cd3a137c3df999e18f744..ca2d688bb7af6df5c4f0ef7525fe7a94d250cb06 100644 (file)
--- 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 21f83dbe29e062186c19f738d9bac9cc51c84e63..2ee219125e7a7e424f12506352866384724c3150 100644 (file)
--- 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 8f4854b95ac89b475161af0bffce267d4dfba4c5..1efcfa192cb5da38eb4d4d9501db008293a479b3 100644 (file)
--- 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 32187d6daf01eeb586b68cec7cff452fcd1dab52..ab441ebe417124477bb49e38bffdd0462837ad53 100644 (file)
--- 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 02383cd5f8c429c0b2fb31e2ca137f1c4e4ac708..c0675434f0cc81856f9b35d920f40a5dd4f19159 100644 (file)
--- 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 77c9e41f73e82b00600db6ac79b369c081bd868f..2500389ee3af3849207c5cb90050efab97c5ceb2 100644 (file)
--- 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 bccb286013e90ed398b82736de27dd94fd3274f0..357b11f0d4291604eea947ad969e52fc4ae2ff93 100644 (file)
--- 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 74c68f96b5b61d63dc044a26c469c382f265bf20..022620d9e7336d6f71b6413b15efacd438f4760b 100644 (file)
--- 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 44d2f0ec81f7a42fa67c5e46793ac362720c3d41..9a918f855d6785eda55a0909055dbc109cf2f7e0 100644 (file)
--- 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 9dfcc7f6bb114899ab74a2a067295a9ac8669ade..e86cbb80d027b75fed80102864d3626b8d86455e 100644 (file)
--- 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 d06bc384b3fbdcbe7118e414195d4e37a6a62c74..3eb689611755080601dda5893573c004da17f3ce 100644 (file)
--- 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 54324576d75f0441c7742350d6cdad35639d4e39..2f067e46223fe2a071d16f10f62cfa81ee538ee2 100644 (file)
--- 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 43e3d49cca68981437de39fc7f740bf55b7f98cc..81014e102f1733c81a4c15c63885a8ceea35e558 100644 (file)
--- 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 4fbb41228d2d016766fbb440645e0e3ae286aa8a..1679bf0d5580d7ae3bca34b2fc2f77ed42fc994a 100644 (file)
--- 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 24ae800744fe1aab33736acced8feb51a45c2b0c..f764e507992b2a3564e554d371b751fe8ffa16db 100644 (file)
--- 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 a2a899d716a40a61dea9ae93de00e48128c2202a..1ccbd8abdba1d80a9e82d5cabb88096a57d91430 100644 (file)
--- 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 55ab1a48d2c9ddd0b43a88ae17bf3df87248f20f..b9a7c2579a3a31df8a166bd80cbb81997833995e 100644 (file)
--- 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 bf35997756618b3d8c177b7dc8585fd7ddc16b79..5ae75c6bee3f33c2c19c65820cabccac85c72f53 100644 (file)
--- 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 6820fa3c7027dbc54dc4813d462c782697b6bf04..e0d6f51f82d161f39a7a3a8984e7f2e73d95844d 100644 (file)
--- 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 8100dc41e3dc1b6bdfd09f7b1d7c298f1fb46e01..1eba6366dc4338553cfa2f157d6f355f4f3ecb74 100644 (file)
--- 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 300a4430e6bd54b7200ddee9dbc5faf685a723be..48f9e44d4c6631c7e8b1b38bd9ea24618e3f4e5d 100644 (file)
--- 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 801053af0ae01317c100524ae6f08c8930be6a77..4124a1c0af8692cc5a2e8c84f89cd0d0e466934d 100644 (file)
--- 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 07872aa7edfb9717fc4fa6a3214ccb892f31b444..7c87ae53ff24bbcb151e494116fb298dc460778e 100644 (file)
--- 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 5bac8aceea21d9ec1a769ebc2bd3989fd9e58762..5ee62d8612e453aa315ab5b6227996d7455a0cde 100644 (file)
--- 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 73b813623feed2348a9f4af2b954307f55894f87..05cb3d8e4285ded9c106fe6793905b5368a66877 100644 (file)
--- 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 c226953c11527aff9e031eb095ac45262f49bb64..18ee83ba8f2461056dd2214ef1c7c3b68e7c7e90 100644 (file)
--- 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 148ab7ac53f888673df6ba58b4de35639c09fffc..d3419fc95406a5fd445e2b9b64d1bd507dfdb197 100644 (file)
--- 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 6a8edcd562611b2ca5652bfd705f10dc61abc9fe..f9171354ff0d9d13b25c6a72a755d4fd5e8e2845 100644 (file)
--- 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 5225495834aa40d2a3b29455e0a92c329be2889b..5b250a32fc2a4da0b2e314312e7d3a1d6debf9ae 100644 (file)
--- 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 7db54bea1bd28f6cbda3d6391bb32682e20a6be5..6e9f7fe5caca155531e4819ce9fa6b597316d23b 100644 (file)
--- 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 c87c0bc135b70afaaf9adc4c418a72024ea89552..36b6d42829a0120d5ece67dcdb4b3b74294f057b 100644 (file)
--- 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 e5aaf3d30d3ba71bc8f00faa6437d2ee4a7deb94..6b1e60f808d7926662072b276f76e45eca4d2a2f 100644 (file)
--- 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 01742009d73b4a9b3b7f14f45dbb7435599b0c4f..37bc0fb4a814d0a74c904530606cdbc8ef861b53 100644 (file)
--- 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 f848d1788aaf46460cd4c7a9ca730e2fdce02026..ac44fe18e99d74f018bbe9a0d6594ea9d02977e1 100644 (file)
--- 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 215c34b7fd893602acb8c366b08219e73924aa88..da6a33ed06192f153ef1213b558194f228e3099a 100644 (file)
--- 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 7f6b13b589cdd6a5967716e7164687fc99fb525c..c73893149dee99c129332ee7b61ca99892670dce 100644 (file)
--- 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 c18c07b83fc3ce8bcbb048be62c8292a83fa8a7f..4e44bbff59c1383af308fc9e833dbad3458a406a 100644 (file)
--- 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 b0b74874f28ab000adb502f4a4496700ebc9240e..5a299ffc5396d5e778c84fac41f812751ee772b3 100644 (file)
--- 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 12713a45e5a66fe53048be67790b938786317c3a..3e02bb1965bd4b6a8b6ac0766db893fb5cdcf109 100644 (file)
--- 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 34c3f10bea354d5a1ff656960dc419e39d9cae95..1f9a6b73fda5ea855903fefe1d7f30560c375b70 100644 (file)
--- 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 2a4a28c0b195d0692a835b84ed4fbdbad3839338..720fc2dec3eb09be3bcf6c5ce828df2a90462306 100644 (file)
--- 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 739113466f58994d282f59d9c17a01596e8c7b9e..baab97ed756e51531e29edab28bea852e463f301 100644 (file)
--- 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 f795b56398015100ed86b37562efec257fc150e5..e2fe5427f92f4cd25dc98411d1fc0a72d40389da 100644 (file)
--- 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 8e38373fb50a5aa1975b9759d9988d0fb24cbb83..ccaac17992c6a4aea6c4b68d2d0419ed8916c09a 100644 (file)
--- 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 dbc3a8d9c5879af477b5569cd4b232245289533a..c7d076defbdcf660674ce4650ecdded074809ab4 100644 (file)
--- 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 ab655676e4c52f1fb799c23f26c793be91d5d2bc..5b1c510a152b03f3ddadaf1262b9337e0f55b979 100644 (file)
--- 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 309e989feebd3aa966dd17c1134559ad5c57008d..3067dc0f78be5cd715a60133b9c129ab6b22a231 100644 (file)
--- 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 9dfbcb5102b0b47ae3736bc0f6b994db8ac6a639..08ad4f50fdcb4a61cc206f650824856a24d7efea 100644 (file)
--- 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 4a0652e73b5a44032124145861c829351ea6a893..905391e1b3222c9f1d03f108814d3361327cd376 100644 (file)
--- 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 a459fddffb28e7448c68e7427be4465f56a209f8..7a55a7735aea263a5688caa067b715619b8b3ea6 100644 (file)
--- 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 4d4464884a7de7ba3c60157589100c673ca66669..3a89b202d81cf05445a7dd16e1976bf5c6a78b86 100644 (file)
--- 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 f2039823003f27bfe6a895a72d93445f22cc4c87..f9fb375adf5a567ec90c6d576135c58924e3f1f4 100644 (file)
--- 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 6ff18baefb0977dc4d1ba6973d81f7dbf60cc7e1..a34ddad11d4f3e702599929ecbd45bcca6bcbffc 100644 (file)
--- 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