Jenkinsfile: Run device manager tests while running e2e tests

As creating a new VM is expensive, Hence running device manager tests in the
same cluster used by e2e tests. It uses the first worker of the populated
cluster to run tests.

Author: avalluri

Jenkinsfile

@@ -159,26 +159,6 @@ pipeline {
             }
         }
 
-        stage('make dm-test') {
-            options {
-                timeout(time: 30, unit: "MINUTES")
-            }
-
-            steps {
-                sh "docker run --rm ${DockerBuildArgs()} \
-                               --privileged=true \
-                               -e TEST_CHECK_SIGNED_FILES=false \
-                               -e TEST_DISTRO=clear \
-                               -e TEST_DISTRO_VERSION=${env.CLEAR_LINUX_VERSION_1_15} \
-                               -v `pwd`:`pwd`:rshared \
-                               -w `pwd` \
-                               ${env.BUILD_IMAGE} bash -c 'set -x; \
-                                   swupd bundle-add openssh-client && \
-                                   make run_dm_tests; \
-                                   make stop'"
-            }
-        }
-
         stage('Build test image') {
             options {
                 timeout(time: 60, unit: "MINUTES")
@@ -440,6 +420,7 @@ void TestInVM(deviceMode, deploymentMode, distro, distroVersion, kubernetesVersi
                                      \$ssh top -b -n 1 -w 120 2>&1 | head -n 20; \
                                  done ) | sed -e \"s/^/\$hostname: /\" & \
                            done && \
+                           make run_dm_tests && \
                            make test_e2e TEST_E2E_REPORT_DIR=`pwd`/build/reports.tmp/\$testrun' \
            "
     } finally {