2 files changed, 19 insertions, 159 deletions
diff --git a/testopia/conf/testopia_execution_template.config b/testopia/conf/testopia_execution_template.config
index 1cc76b9..a4898a0 100644
--- a/testopia/conf/testopia_execution_template.config
+++ b/testopia/conf/testopia_execution_template.config
@@ -1,51 +1,6 @@
-[BitBake]
-1=MANUAL_BitBake
-
 [BSP/QEMU]
-1=MANUAL_BSP/QEMU_core-image-sato-sdk_Genericx86-64_NUC
-2=MANUAL_BSP/QEMU_core-image-sato-sdk_Genericx86_MTURBOT
-3=MANUAL_BSP/QEMU_core-image-sato-sdk_Beaglebone-Black
-4=MANUAL_BSP/QEMU_core-image-sato-sdk_EdgeRouter
-5=MANUAL_BSP/QEMU_core-image-sato-sdk_MPC8315e-rdb
-6=MANUAL_BSP/QEMU_core-image-sato-sdk_ANYQEMU
-7=AUTO_BSP/QEMU_core-image-sato-sdk_ANYQEMU
-8=AUTO_BSP/QEMU_core-image-sato-sdk_ANYBSP
-9=AUTO_BSP/QEMU_core-image-lsb-sdk_ANYBSP
-10=AUTO_BSP/QEMU_selftest_ANYQEMU
-
-[Meta-yocto]
-1=MANUAL_Meta-yocto
-
-[OE-Core]
-1=AUTO_OE-Core
-
-[Build-Appliance]
-1=MANUAL_Build-Appliance
-
-[Toaster]
-1=MANUAL_Toaster_UI-unmanaged-mode
-2=MANUAL_Toaster_UI-managed-mode
-
-[ADT]
-1=AUTO_ADT_SDK
-2=MANUAL_ADT_SDK
-
-[CROPS]
-1=AUTO_CROPS_Poky
-2=MANUAL_CROPS_eSDK
-
-[Eclipse-Plugin]
-1=MANUAL_Eclipse-Plugin
-
-[eSDK]
-1=AUTO_eSDK_sdkext
-2=AUTO_eSDK_oeselftest
-
-[Kernel]
-1=ALL
-
-[Runtime]
-1=ALL
-
-[Package-Management-Issues]
-1=AUTO_Package-Management-Issues
-\ No newline at end of file
+1=MANUAL_BSP/POKY_TINY
+2=MANUAL_BSP/QEMU_core-image-sato-sdk_corei7-64_NUC
+3=MANUAL_BSP/QEMU_core-image-sato-sdk_corei7-64_MTURBOT64
+4=AUTO_BSP/QEMU_core-image-sato-sdk_ANYBSP
+5=AUTO_BSP/QEMU_core-image-lsb-sdk_ANYBSP
+\ No newline at end of file
diff --git a/testopia/conf/testopia_execution_template_environment.config b/testopia/conf/testopia_execution_template_environment.config
index 8bb5c2f..3459ebf 100644
--- a/testopia/conf/testopia_execution_template_environment.config
+++ b/testopia/conf/testopia_execution_template_environment.config
@@ -1,115 +1,20 @@
-[MANUAL_BitBake]
-1=Ubuntu 16.04 x86_64
+[MANUAL_BSP/POKY_TINY]
+1=corei7-64_NUC7
 
-[MANUAL_BSP/QEMU_core-image-sato-sdk_Genericx86-64_NUC]
-1=genericx86-64 on NUC7
+[MANUAL_BSP/QEMU_core-image-sato-sdk_corei7-64_NUC]
+1=corei7-64_NUC7
 
-[MANUAL_BSP/QEMU_core-image-sato-sdk_Genericx86_MTURBOT]
-1=genericx86-64 on MTURBOT64
-
-[MANUAL_BSP/QEMU_core-image-sato-sdk_Beaglebone-Black]
-1=Beaglebone Black
-
-[MANUAL_BSP/QEMU_core-image-sato-sdk_EdgeRouter]
-1=EdgeRouter
-
-[MANUAL_BSP/QEMU_core-image-sato-sdk_MPC8315e-rdb]
-1=MPC8315e-rdb
-
-[MANUAL_BSP/QEMU_core-image-sato-sdk_ANYQEMU]
-1=qemu-x86
-2=qemu-x86-64
-3=qemuarm
-4=qemuarm64
-5=qemumips
-6=qemumips64
-7=qemuppc
-
-[AUTO_BSP/QEMU_core-image-sato-sdk_ANYQEMU]
-1=qemu-x86
-2=qemu-x86-64
-3=qemuarm
-4=qemuarm64
-5=qemumips
-6=qemumips64
-7=qemuppc
+[MANUAL_BSP/QEMU_core-image-sato-sdk_corei7-64_MTURBOT64]
+1=corei7-64_MTURBOT64
 
 [AUTO_BSP/QEMU_core-image-sato-sdk_ANYBSP]
-1=genericx86 on MTURBOT32
-2=genericx86-64 on MTURBOT64
-3=genericx86-64 on NUC6
-4=genericx86-64 on NUC7
-5=Beaglebone Black
-6=EdgeRouter
-7=MPC8315e-rdb
+1=core2-32_MTURBOT32
+2=corei7-64_MTURBOT64
+3=corei7-64_NUC6
+4=corei7-64_NUC7
 
 [AUTO_BSP/QEMU_core-image-lsb-sdk_ANYBSP]
-1=genericx86-WIC on MTURBOT32
-2=genericx86-64-WIC on MTURBOT64
-3=genericx86-64-WIC on NUC6
-4=genericx86-64-WIC on NUC7
-5=qemu-x86-WIC
-6=qemu-x86-64-WIC
-
-[AUTO_BSP/QEMU_selftest_ANYQEMU]
-1=qemu-x86
-2=qemu-x86-64
-3=qemuarm
-4=qemuarm64
-5=qemumips
-6=qemumips64
-7=qemuppc
-
-[MANUAL_Meta-yocto]
-1=Ubuntu 16.04 x86_64
-
-[AUTO_OE-Core]
-1=CentOS 7 x86_64
-2=Debian 9 x86_64
-3=Fedora 26 x86_64
-4=Fedora 27 x86_64
-5=OpenSuse 42.3 x86_64
-6=Ubuntu 16.04 x86_64
-7=Ubuntu 17.10 x86_64
-
-[MANUAL_Build-Appliance]
-1=VMWare Player on Ubuntu
-
-[DEFAULT_Toaster]
-1=Ubuntu 16.04 x86_64
-
-[DEFAULT_ADT]
-1=Fedora 26 i686
-2=Ubuntu 16.04 x86_64
-
-[AUTO_ADT_SDK]
-1=qemu-x86
-2=qemu-x86-64
-3=qemuarm
-4=qemuarm64
-5=qemumips
-6=qemumips64
-7=qemuppc
-
-[MANUAL_ADT_SDK]
-1=Fedora 26 i686
-2=Ubuntu 16.04 x86_64
-
-[DEFAULT_CROPS]
-1=Ubuntu 16.04
-
-[MANUAL_Eclipse-Plugin]
-1=Oxygen - Fedora26
-2=Neon - Fedora 24
-
-[DEFAULT_eSDK]
-1=Ubuntu 16.04
-
-[DEFAULT_Kernel]
-1=Ubuntu 16.04
-
-[DEFAULT_Runtime]
-1=user-preference (any supported environment)
-
-[AUTO_Package-Management-Issues]
-1=Any Supported Distro
+1=core2-32_WIC_MTURBOT32
+2=corei7-64_WIC_MTURBOT64
+3=corei7-64_WIC_NUC6
+4=corei7-64_WIC_NUC7
+\ No newline at end of file