summaryrefslogtreecommitdiffstats
path: root/jjb/functest
diff options
context:
space:
mode:
Diffstat (limited to 'jjb/functest')
-rw-r--r--jjb/functest/xtesting.yaml11
1 files 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