summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/airship/airship.yaml3
-rw-r--r--jjb/airship/cntt.yaml3
-rw-r--r--jjb/functest/functest.yaml2
3 files changed, 5 insertions, 3 deletions
diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index 3c1a7daff..076715958 100644
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -330,7 +330,7 @@
builders:
- shell: |
set +x
- [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
+ [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
if [ "{repo}" = "_" ]; then
image={container}:{functest_tag}
elif [ "{port}" = "None" ]; then
@@ -346,6 +346,7 @@
-e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
-e BUILD_TAG=$BUILD_TAG \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+ -v /home/opnfv/functest/.boto:/root/.boto \
$image zip_campaign
- job-template:
diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
index 2d46a6a08..98d0ae3c3 100644
--- a/jjb/airship/cntt.yaml
+++ b/jjb/airship/cntt.yaml
@@ -357,7 +357,7 @@
builders:
- shell: |
set +x
- [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
+ [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
if [ "{repo}" = "_" ]; then
image={container}:{functest_tag}
elif [ "{port}" = "None" ]; then
@@ -373,6 +373,7 @@
-e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
-e BUILD_TAG=$BUILD_TAG \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+ -v /home/opnfv/functest/.boto:/root/.boto \
$image zip_campaign
- job-template:
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 249c1d582..25a3d1ee8 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -422,7 +422,7 @@
- project:
name: 'functest-{tag}-zip'
<<: *functest-params
- container: 'healthcheck'
+ container: 'functest-healthcheck'
jobs:
- 'functest-{tag}-zip'