From d5218d7fdfee0b176d1f5e9df99e7ac3d66c1877 Mon Sep 17 00:00:00 2001
From: MatthewLi <matthew.lijun@huawei.com>
Date: Wed, 11 Jan 2017 04:46:32 -0500
Subject: dovetail: separate dovetail jenkins job

JIRA: DOVETAIL-177

Change-Id: Iaa21373ae7f5bbc777872ea9b6ac9479b1dcff08
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
---
 jjb/dovetail/dovetail-ci-jobs.yml | 7 -------
 jjb/dovetail/dovetail-run.sh      | 9 ++++++---
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'jjb')

diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index 2b6ab7621..08eb5a5f1 100644
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -227,13 +227,6 @@
         - shell:
             !include-raw: ./dovetail-run.sh
 
-
-- builder:
-    name: dovetail-fetch-os-creds
-    builders:
-        - shell:
-            !include-raw: ../../utils/fetch_os_creds.sh
-
 - builder:
     name: dovetail-cleanup
     builders:
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index 4cc03f7c9..0a2f156cc 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -66,9 +66,12 @@ if [ $(docker ps | grep "opnfv/dovetail:${DOCKER_TAG}" | wc -l) == 0 ]; then
     exit 1
 fi
 
-exec_cmd="python ${DOVETAIL_REPO_DIR}/dovetail/run.py --testsuite ${TESTSUITE} -d true"
-echo "Container exec command: ${exec_cmd}"
-docker exec ${container_id} ${exec_cmd}
+list_cmd="dovetail list ${TESTSUITE}"
+run_cmd="dovetail run --testsuite ${TESTSUITE} -d true"
+echo "Container exec command: ${list_cmd}"
+docker exec $container_id ${list_cmd}
+echo "Container exec command: ${run_cmd}"
+docker exec $container_id ${run_cmd}
 
 sudo cp -r ${DOVETAIL_REPO_DIR}/results ./
 #To make sure the file owner is jenkins, for the copied results files in the above line
-- 
cgit 1.2.3-korg