From 2df02010bd24164a0c009cb7b6eae747433a31aa Mon Sep 17 00:00:00 2001
From: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date: Wed, 30 Nov 2016 11:44:27 +0000
Subject: doctor: fix file paths

- fix file path to mount doctor code under review

- re-add workaround to archive functest suite log

- drop unnecessary params for jobs

Change-Id: I51ed4dbd7178c875cb6b047f26ae4c1db3d94687
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
---
 jjb/doctor/doctor.yml | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'jjb')

diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml
index dfce40202..9a74f4e3d 100644
--- a/jjb/doctor/doctor.yml
+++ b/jjb/doctor/doctor.yml
@@ -85,9 +85,11 @@
             name: OS_CREDS
             default: /home/jenkins/openstack.creds
             description: 'OpenStack credentials'
-        - '{installer}-defaults'
         - '{slave-label}-defaults'
-        # functest
+        - string:
+            name: INSTALLER_TYPE
+            default: '{installer}'
+            description: 'Installer used for deploying OPNFV on this POD'
         - string:
             name: DOCKER_TAG
             default: '{docker-tag}'
@@ -95,13 +97,14 @@
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-nosdn-nofeature-ha'
+            description: 'Scenario to deploy and test'
         # functest-suite-parameter
         - string:
             name: FUNCTEST_SUITE_NAME
             default: '{project}'
         - string:
             name: TESTCASE_OPTIONS
-            default: '-e INSPECTOR_TYPE={inspector} -v $WORKSPACE:$HOME/opnfv/repos/doctor'
+            default: '-e INSPECTOR_TYPE={inspector} -v $WORKSPACE:/home/opnfv/repos/doctor'
             description: 'Addtional parameters specific to test case(s)'
         # functest-parameter
         - string:
@@ -158,5 +161,18 @@
         - 'functest-suite-builder'
 
     publishers:
+        - postbuildscript:
+            builders:
+                - functest-copy-suite-log:
+                    suite: '{project}'
+                    stream: '{stream}'
+            script-only-if-succeeded: False
+            script-only-if-failed: False
         - archive:
-            artifacts: '$HOME/opnfv/functest/results/{stream}/{project}.log'
+            artifacts: '*.log'
+
+- builder:
+    name: functest-copy-suite-log
+    builders:
+        - shell: |
+            cp $HOME/opnfv/functest/results/{stream}/{suite}.log $WORKSPACE/
-- 
cgit 1.2.3-korg