[VOL-3679] integrate new multi olt tests on Jenkins jobs
Change-Id: I9334f47a721101e746c3f4dee63a1c9af70c57f3
diff --git a/Makefile b/Makefile
index 8a95e72..ec8a7e5 100755
--- a/Makefile
+++ b/Makefile
@@ -227,6 +227,21 @@
bbsim-multiolt-failurescenarios: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_MULTIPLE_OLT_FILE)
bbsim-multiolt-failurescenarios: voltha-test
+bbsim-multiolt-kind: ROBOT_MISC_ARGS += -X $(ROBOT_DEBUG_LOG_OPT) -e PowerSwitch -e PhysicalOLTReboot
+bbsim-multiolt-kind: ROBOT_FILE := Voltha_MultiOLT_Tests.robot
+bbsim-multiolt-kind: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_MULTIPLE_OLT_FILE)
+bbsim-multiolt-kind: voltha-test
+
+bbsim-multiolt-kind-dt: ROBOT_MISC_ARGS += -X $(ROBOT_DEBUG_LOG_OPT) -e PowerSwitch -e PhysicalOLTReboot
+bbsim-multiolt-kind-dt: ROBOT_FILE := Voltha_DT_MultiOLT_Tests.robot
+bbsim-multiolt-kind-dt: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_MULTIPLE_OLT_FILE)
+bbsim-multiolt-kind-dt: voltha-dt-test
+
+multiolt-kind-dt: ROBOT_MISC_ARGS += -X $(ROBOT_DEBUG_LOG_OPT) -i functionalDt
+multiolt-kind-dt: ROBOT_FILE := Voltha_DT_MultiOLT_Tests.robot
+multiolt-kind-dt: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_MULTIPLE_OLT_FILE)
+multiolt-kind-dt: voltha-dt-test
+
bbsim-failurescenarios-dt: ROBOT_MISC_ARGS += -X $(ROBOT_DEBUG_LOG_OPT) -e PowerSwitchOnuRebootDt -e PhysicalOltRebootDt
bbsim-failurescenarios-dt: ROBOT_FILE := Voltha_DT_FailureScenarios.robot
bbsim-failurescenarios-dt: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_DT_SINGLE_PON_FILE)
diff --git a/tests/dt-workflow/Voltha_DT_MultiOLT_Tests.robot b/tests/dt-workflow/Voltha_DT_MultiOLT_Tests.robot
index 83d2d36..46aa5a1 100644
--- a/tests/dt-workflow/Voltha_DT_MultiOLT_Tests.robot
+++ b/tests/dt-workflow/Voltha_DT_MultiOLT_Tests.robot
@@ -66,7 +66,7 @@
[Setup] Start Logging MultiOlt_Physical_Dt
[Teardown] Run Keywords Collect Logs
... AND Stop Logging MultiOlt_Physical_Dt
- ... AND Delete All Devices and Verify
+ #... AND Delete All Devices and Verify
# Add OLT device
Setup
# Performing Sanity Test to make sure subscribers are all DHCP and pingable
@@ -124,6 +124,7 @@
#... AND Setup
[Teardown] Run Keywords Collect Logs
... AND Stop Logging MultiOLTSoftRebootDt
+ ... AND Delete All Devices and Verify
#... AND Delete Device and Verify
Pass Execution If ${olt_count} == 1 Skipping test: just one OLT
# Reboot the first OLT
diff --git a/tests/functional/Voltha_MultiOLT_Tests.robot b/tests/functional/Voltha_MultiOLT_Tests.robot
index ce209a8..aae5d5c 100644
--- a/tests/functional/Voltha_MultiOLT_Tests.robot
+++ b/tests/functional/Voltha_MultiOLT_Tests.robot
@@ -65,7 +65,7 @@
[Setup] Start Logging MultipleOlt-PhysicalOLTReboot
[Teardown] Run Keywords Collect Logs
... AND Stop Logging MultipleOlt-PhysicalOLTReboot
- ... AND Delete All Devices and Verify
+ #... AND Delete All Devices and Verify
# Add OLT device
setup
# Performing Sanity Test to make sure subscribers are all AUTH+DHCP and pingable
@@ -123,6 +123,7 @@
[Setup] Start Logging MultiOlt-OLTSoftReboot
[Teardown] Run Keywords Collect Logs
... AND Stop Logging MultiOlt-OLTSoftReboot
+ ... AND Delete All Devices and Verify
#Delete All Devices and Verify
#Setup
## Performing Sanity Test to make sure subscribers are all AUTH+DHCP and pingable