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
This commit is contained in:
parent
4e31fd30ba
commit
0f069cf9b6
@ -48,4 +48,4 @@ fi
|
||||
# return error catching back
|
||||
set -o errexit
|
||||
|
||||
sudo chown -R jenkins:jenkins "${dst}"
|
||||
sudo chown -R $USER:stack "${dst}"
|
||||
|
@ -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}"
|
||||
|
||||
}
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user