JIRA: VAL-88
Remove the trap from the script. Change the owner after the
scripts exists.
Signed-off-by: valentin.radulescu <valentin.radulescu@enea.com>
Change-Id: I9284c041c436f7ca173b61e3d5d87fdc85581ebb
set -o pipefail
cwd=$(pwd)
set -o pipefail
cwd=$(pwd)
-finish() {
- # Fix ownership of output files
- user_id=$(stat -c '%u:%g' $cwd)
- sudo chown -R ${user_id} $results_dir
-}
-
info () {
logger -s -t "run_blu_val.info" "$*"
}
info () {
logger -s -t "run_blu_val.info" "$*"
}
+change_res_owner() {
+# change owner of results created by root in container
+ if [ -d "$results_dir" ]
+ then
+ sudo chown -R "$current_user" "$results_dir"
+ fi
+}
+
usage() {
echo "usage: $0 -n <blueprint_name>" >&2
echo "[-r <results_dir> results dir">&2
usage() {
echo "usage: $0 -n <blueprint_name>" >&2
echo "[-r <results_dir> results dir">&2
if [ ! -d "$cwd/validation" ]
then
git clone http://gerrit.akraino.org/r/validation
if [ ! -d "$cwd/validation" ]
then
git clone http://gerrit.akraino.org/r/validation
+
+set +e
+# even if the script fails we need to change the owner of results
# shellcheck disable=SC2086
python3 validation/bluval/blucon.py $options "$blueprint_name"
# shellcheck disable=SC2086
python3 validation/bluval/blucon.py $options "$blueprint_name"
+
+if [ $? -ne 0 ]; then
+ change_res_owner
+ error "Bluval validation failed!"
+fi
+
+set -e
+
+change_res_owner