From 0f069cf9b622667d429e40d054b310495a22e608 Mon Sep 17 00:00:00 2001
From: Nam Nguyen Hoai <namnh@vn.fujitsu.com>
Date: Wed, 18 Oct 2017 13:33:08 +0700
Subject: [PATCH] Use generic user for both zuul v2 and v3

Zuul v2 uses 'jenkins' as user, but Zuul v3 uses 'zuul'.
Using $USER solves it for both cases.

Change-Id: I7e3ca8fa9a48f3308dec46eda4ccf7e76d7b6338
---
 murano-ci/scripts/collect_logs.sh    | 2 +-
 murano-ci/scripts/collect_results.sh | 2 +-
 murano-ci/scripts/deploy_devstack.sh | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/murano-ci/scripts/collect_logs.sh b/murano-ci/scripts/collect_logs.sh
index cc022425..586d74fc 100644
--- a/murano-ci/scripts/collect_logs.sh
+++ b/murano-ci/scripts/collect_logs.sh
@@ -48,4 +48,4 @@ fi
 # return error catching back
 set -o errexit
 
-sudo chown -R jenkins:jenkins "${dst}"
+sudo chown -R $USER:stack "${dst}"
diff --git a/murano-ci/scripts/collect_results.sh b/murano-ci/scripts/collect_results.sh
index 35645e29..920fc515 100644
--- a/murano-ci/scripts/collect_results.sh
+++ b/murano-ci/scripts/collect_results.sh
@@ -19,7 +19,7 @@
 function create_artifacts_dir() {
     dst="${WORKSPACE}/artifacts"
     mkdir -p "${dst}"
-    sudo chown -R jenkins:jenkins "${dst}"
+    sudo chown -R $USER:stack "${dst}"
 
 }
 
diff --git a/murano-ci/scripts/deploy_devstack.sh b/murano-ci/scripts/deploy_devstack.sh
index 1f698894..72193ed4 100644
--- a/murano-ci/scripts/deploy_devstack.sh
+++ b/murano-ci/scripts/deploy_devstack.sh
@@ -19,7 +19,7 @@
 function git_clone_devstack() {
     local DEVSTACK_BRANCH=${DEVSTACK_BRANCH:=master}
     sudo mkdir -p "${STACK_HOME}"
-    sudo chown -R jenkins:jenkins "${STACK_HOME}"
+    sudo chown -R $USER:stack "${STACK_HOME}"
     git clone https://github.com/openstack-dev/devstack "${STACK_HOME}/devstack"
 
     pushd "${STACK_HOME}/devstack"
@@ -37,7 +37,7 @@ function deploy_devstack() {
     local git_dir=/opt/git
 
     sudo mkdir -p "${git_dir}/openstack"
-    sudo chown -R jenkins:jenkins "${git_dir}/openstack"
+    sudo chown -R $USER:stack "${git_dir}/openstack"
     git clone https://github.com/openstack/murano "${git_dir}/openstack/murano"
 
     if [ "${ZUUL_PROJECT}" == 'openstack/murano' ]; then