From f022b470e2828520e7179001c97dbecb449241c2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Wed, 2 Jan 2019 01:43:09 +0100
Subject: [PATCH] Fix Xtesting workspace
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

It completes "Publish Xtesting daily jobs" [1].

[1] https://gerrit.opnfv.org/gerrit/#/c/66131/

Change-Id: I82cd92f8ad3fd777868eba9875793846662cfddf
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 jjb/functest/xtesting.yaml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 0a0e60514..85a008c7d 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -15,7 +15,7 @@
     parameters:
       - label:
           name: slave
-          default: opnfv-build-ubuntu
+          default: lf-build2
 
 - job-template:
     name: '{repo}-{container}-{tag}-pull'
@@ -62,20 +62,19 @@
     builders:
       - shell: |
           set +ex
-          rm -rf /var/jenkins_home/workspace/$JOB_NAME/*
+          rm -rf /var/lib/jenkins/workspace/$JOB_NAME/*
           if [ "{port}" = "None" ]; then
             image={repo}/{container}:{tag}
           else
             image={repo}:{port}/{container}:{tag}
           fi
           sudo docker run --rm \
-            --link testapi:testapi \
-            -v /data/jenkins/workspace/$JOB_NAME/results:/var/lib/xtesting/results \
+            -v /var/lib/jenkins/workspace/$JOB_NAME/results:/var/lib/xtesting/results \
             $image run_tests -t {test}
           res=$?
-          gsutil -m cp -r /var/jenkins_home/workspace/$JOB_NAME/ \
+          gsutil -m cp -r /var/lib/jenkins/workspace/$JOB_NAME/ \
             gs://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID > /dev/null
-          find /var/jenkins_home/workspace/$JOB_NAME/ -type f \
+          find /var/lib/jenkins/workspace/$JOB_NAME/ -type f \
             -printf \
             "http://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID/%P\n"
           exit $res
-- 
2.16.6