From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 23 Dec 2019 18:53:55 +0000 (+0100)
Subject: Mount .boto when dumping all logs
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F42%2F69442%2F1;p=releng.git

Mount .boto when dumping all logs

It fixes the current issue [1].

[1] https://build.opnfv.org/ci/job/airship-latest-zip/2/console

Change-Id: I74c8f967e9c951d98a1ab47b8998876ec4e8268d
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

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: