From a361f33497c8e87a4eab48a666fcb4a586a607b1 Mon Sep 17 00:00:00 2001
From: Manu Seth <22492939+mseth10@users.noreply.github.com>
Date: Thu, 11 Jun 2020 09:17:44 -0700
Subject: [PATCH] revert changes causing cd failures (#18533)

Reverting the following changes to cd_unittest_ubuntu causing CD pipeline failures:

    The first change was using Naive Engine for operator tests, which causes timeout failures in CD
    Added here: 10b6b48

    Second change was running integrationtest_ubuntu_gpu_byteps as part of cu* CD tests, added here: e28e9fe
---
 ci/docker/runtime_functions.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
index 62412e092523..1f25942f454a 100755
--- a/ci/docker/runtime_functions.sh
+++ b/ci/docker/runtime_functions.sh
@@ -947,9 +947,7 @@ cd_unittest_ubuntu() {
 
     local mxnet_variant=${1:?"This function requires a mxnet variant as the first argument"}
 
-    pytest -m 'not serial' -k 'not test_operator' -n 4 --durations=50 --verbose tests/python/unittest
-    MXNET_ENGINE_TYPE=NaiveEngine \
-        pytest -m 'not serial' -k 'test_operator' -n 4 --durations=50 --verbose tests/python/unittest
+    pytest -m 'not serial' -n 4 --durations=50 --verbose tests/python/unittest
     pytest -m 'serial' --durations=50 --verbose tests/python/unittest
     pytest -n 4 --durations=50 --verbose tests/python/quantization
 
@@ -968,7 +966,8 @@ cd_unittest_ubuntu() {
 
         # TODO(szha): fix and reenable the hanging issue. tracked in #18098
         # integrationtest_ubuntu_gpu_dist_kvstore
-        integrationtest_ubuntu_gpu_byteps
+        # TODO(eric-haibin-lin): fix and reenable
+        # integrationtest_ubuntu_gpu_byteps
     fi
 
     if [[ ${mxnet_variant} = *mkl ]]; then