summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthewLi <matthew.lijun@huawei.com>2017-03-29 05:14:16 -0400
committerMatthewLi <matthew.lijun@huawei.com>2017-03-29 05:47:44 -0400
commitf1105963ff4c410227f48845923c24291f8cb6d8 (patch)
tree97eda08906c99e58d72f59e554608a5e652994ca
parent2f14f91f142709b4ec2c91f78a99ecdbe896046d (diff)
dovetail: fix wipe workspace error
JIRA: DOVETAIL-377 workspace wipe clean error log https://build.opnfv.org/ci/job/dovetail-compass-virtual-debug-master/365/console this is caused of wrong permissions with files under $WORKSPACE seems the former method in dovetail-run not take effects(log into host, it's still root:root, not $USER:$USER_GROUP) use global fix workspace permission in wrapper to replace former method Change-Id: I6ceaaf630590666f3b3db5f2628334879df2b8fb Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
-rw-r--r--jjb/dovetail/dovetail-ci-jobs.yml7
-rwxr-xr-xjjb/dovetail/dovetail-run.sh10
-rw-r--r--jjb/dovetail/dovetail-weekly-jobs.yml3
3 files changed, 13 insertions, 7 deletions
diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index 0bd32a4ab..b65e6d5ef 100644
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -208,15 +208,18 @@
- 'dovetail-cleanup'
- 'dovetail-run'
+ wrappers:
+ - fix-workspace-permissions
+
publishers:
- archive:
artifacts: 'results/**/*'
allow-empty: true
fingerprint: true
-########################
+#--------------------------
# builder macros
-########################
+#--------------------------
- builder:
name: dovetail-run
builders:
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index 4b00ec881..5161a3c7c 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -85,11 +85,11 @@ echo "Container exec command: ${run_cmd}"
docker exec $container_id ${run_cmd}
sudo cp -r ${DOVETAIL_REPO_DIR}/results ./
-#To make sure the file owner is the current user, for the copied results files in the above line
-#if not, there will be error when next time to wipe workspace
-CURRENT_USER=${SUDO_USER:-$USER}
-PRIMARY_GROUP=$(id -gn $CURRENT_USER)
-sudo chown -R ${CURRENT_USER}:${PRIMARY_GROUP} ${WORKSPACE}/results
+# To make sure the file owner is the current user, for the copied results files in the above line
+# if not, there will be error when next time to wipe workspace
+# CURRENT_USER=${SUDO_USER:-$USER}
+# PRIMARY_GROUP=$(id -gn $CURRENT_USER)
+# sudo chown -R ${CURRENT_USER}:${PRIMARY_GROUP} ${WORKSPACE}/results
echo "Dovetail: done!"
diff --git a/jjb/dovetail/dovetail-weekly-jobs.yml b/jjb/dovetail/dovetail-weekly-jobs.yml
index 8edce4246..7b3ede902 100644
--- a/jjb/dovetail/dovetail-weekly-jobs.yml
+++ b/jjb/dovetail/dovetail-weekly-jobs.yml
@@ -114,6 +114,9 @@
- 'dovetail-cleanup'
- 'dovetail-run'
+ wrappers:
+ - fix-workspace-permissions
+
publishers:
- archive:
artifacts: 'results/**/*'