3 files changed, 9 insertions, 39 deletions

diff --git a/meta/lib/oeqa/manual/bsp-hw.json b/meta/lib/oeqa/manual/bsp-hw.json
index 4b7c76f70f..18cec222fc 100644
--- a/meta/lib/oeqa/manual/bsp-hw.json
+++ b/meta/lib/oeqa/manual/bsp-hw.json
@@ -526,7 +526,7 @@
                     "expected_results": ""
                 },
                 "4": {
-                    "action": "check ping status  \n\nNote: This TC apply only for core-image-full-cmd and core-image-lsb .",
+                    "action": "check ping status  \n\nNote: This TC apply only for core-image-full-cmd.",
                     "expected_results": "ping should always work before/after standby"
                 }
             },
diff --git a/meta/lib/oeqa/manual/compliance-test.json b/meta/lib/oeqa/manual/compliance-test.json
index 8c13b68ec3..367a416f01 100644
--- a/meta/lib/oeqa/manual/compliance-test.json
+++ b/meta/lib/oeqa/manual/compliance-test.json
@@ -1,36 +1,6 @@
 [
     {
         "test": {
-            "@alias": "compliance-test.compliance-test.LSB_subset_test_suite",
-            "author": [
-                {
-                    "email": "corneliux.stoicescu@intel.com",
-                    "name": "corneliux.stoicescu@intel.com"
-                }
-            ],
-            "execution": {
-                "1": {
-                    "action": "Get lsd-sdk image and install it on target device or start the image(if it is QEMU) with option \"-m 512M\"",
-                    "expected_results": ""
-                },
-                "2": {
-                    "action": "Comment in /opt/lsb-test/session any tests you don't want to run.",
-                    "expected_results": ""
-                },
-                "3": {
-                    "action": "Run /usr/bin/LSB_Test.sh which should download the LSB suite and set it up. Some packages may fail to download because their location changed on ftp.linuxfoundation.org. You need to manually update /opt/lsb-test/packages_list",
-                    "expected_results": ""
-                },
-                "4": {
-                    "action": "Tests should start automatically, you can use the web interface to reconfigure the setup. ",
-                    "expected_results": "Check the result on wiki https://wiki.yoctoproject.org/wiki/LSB_Result No regression failures should be met."
-                }
-            },
-            "summary": "LSB_subset_test_suite"
-        }
-    },
-    {
-        "test": {
             "@alias": "compliance-test.compliance-test.stress_test_-_Genericx86-64",
             "author": [
                 {
@@ -40,7 +10,7 @@
             ],
             "execution": {
                 "1": {
-                    "action": "Bootup with core-image-lsb-sdk image",
+                    "action": "Bootup with core-image-sato-sdk image",
                     "expected_results": ""
                 },
                 "2": {
diff --git a/meta/lib/oeqa/manual/toaster-managed-mode.json b/meta/lib/oeqa/manual/toaster-managed-mode.json
index 812f57da34..12374c7c64 100644
--- a/meta/lib/oeqa/manual/toaster-managed-mode.json
+++ b/meta/lib/oeqa/manual/toaster-managed-mode.json
@@ -1494,7 +1494,7 @@
           "expected_results": "A type in form appears. \n\n\t"
         },
         "6": {
-          "action": "Change distro (ex: poky-lsb). \n\n\t",
+          "action": "Change distro (ex: poky-tiny). \n\n\t",
           "expected_results": "Distro has changed. \n\n\t"
         },
         "7": {
@@ -1503,7 +1503,7 @@
         },
         "8": {
           "action": " Build a recipe (ex: core-image-minimal) and wait until build finish.",
-          "expected_results": "Build finishes successfully. \n\nThe 'success' criteria for this one should be that the build is reported as using the poky-lsb distro in the build summary page, and that the DISTRO variable value in the bitbake variables table is set to the value specified in toaster (poky-lsb again)."
+          "expected_results": "Build finishes successfully. \n\nThe 'success' criteria for this one should be that the build is reported as using the poky-tiny distro in the build summary page, and that the DISTRO variable value in the bitbake variables table is set to the value specified in toaster (poky-tiny again)."
         }
       },
       "summary": "Build_a_recipe_with_different_distro"
@@ -1612,7 +1612,7 @@
           "expected_results": ""
         },
         "3": {
-          "action": "Check that the table is populated with the list of image recipes (eg. core-image minimal, core-image-lsb) \n\n\n",
+          "action": "Check that the table is populated with the list of image recipes (eg. core-image minimal) \n\n\n",
           "expected_results": ""
         },
         "4": {
@@ -1670,7 +1670,7 @@
           "expected_results": ""
         },
         "7": {
-          "action": "Sort the table by \"Layer\" and then navigate away by selecting an image (such as core-image-lsb). When you click the \"back\" button in the web-browser to go back, the \"New custom image\" table should still be sorted by \"Layer\".  \nThis should apply also by navigating back to the page by any other means. \n\n",
+          "action": "Sort the table by \"Layer\" and then navigate away by selecting an image. When you click the \"back\" button in the web-browser to go back, the \"New custom image\" table should still be sorted by \"Layer\".  \nThis should apply also by navigating back to the page by any other means. \n\n",
           "expected_results": ""
         },
         "8": {
@@ -2348,7 +2348,7 @@
           "expected_results": ""
         },
         "3": {
-          "action": "Build 6 recipes example (core-image-sato, core-image-minimal, core-image-base, core-image-lsb, core-image-clutter) to name a few. ",
+          "action": "Build 6 recipes example (core-image-sato, core-image-minimal, core-image-base, core-image-clutter) to name a few. ",
           "expected_results": " All recipes are built correctly \n\n"
         },
         "4": {
@@ -2382,7 +2382,7 @@
           "expected_results": ""
         },
         "3": {
-          "action": "Build 6 recipes example (core-image-sato, core-image-minimal, core-image-base, core-image-lsb, core-image-clutter) to name a few. \n\n",
+          "action": "Build 6 recipes example (core-image-sato, core-image-minimal, core-image-base, core-image-clutter) to name a few. \n\n",
           "expected_results": "All recipes are built correctly \n\n"
         },
         "4": {
@@ -2420,7 +2420,7 @@
           "expected_results": ""
         },
         "3": {
-          "action": "Build 4 recipes example (core-image-sato, core-image-minimal, core-image-base, core-image-lsb, core-image-clutter) to name a few. \n\n",
+          "action": "Build 4 recipes example (core-image-sato, core-image-minimal, core-image-base, core-image-clutter) to name a few. \n\n",
           "expected_results": " All recipes are built correctly \n\n"
         },
         "4": {