summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-24 18:32:13 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-09-26 12:05:36 +0000
commitad80446126ee6c72ee07709b33fd016c5ea07e01 (patch)
tree76a9c0d688b4f465dae273b0b3945cb3d24ec084
parent133e35d5d89e48e46d3e5818a9e70dac84827334 (diff)
[fuel] build, deploy: Run as regular user
Change-Id: I70f8e7c9372e22e6f3e357b48a0a49f44a4d9078 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rwxr-xr-xjjb/fuel/fuel-deploy.sh6
-rw-r--r--jjb/fuel/fuel-docker-jobs.yaml2
2 files changed, 2 insertions, 6 deletions
diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index aa7b3bbb6..c0cdc3dc2 100755
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -27,10 +27,6 @@ fi
echo "Using configuration for ${LAB_NAME}"
-# Certain labs do not require the deploy script to be ran with sudo
-SUDO='sudo -E'
-[[ ! "${LAB_NAME}" =~ (arm|enea|unh) ]] || SUDO=
-
# create TMPDIR if it doesn't exist, change permissions
mkdir -p "${TMPDIR}"
sudo chmod a+x "${HOME}" "${TMPDIR}"
@@ -44,7 +40,7 @@ FUEL_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}.log.tar.gz"
[[ ! "${JOB_NAME}" =~ verify-deploy-virtual-arm64 ]] || EXTRA_ARGS='-e'
# construct the command
-DEPLOY_COMMAND="${SUDO} ${WORKSPACE}/ci/deploy.sh \
+DEPLOY_COMMAND="${WORKSPACE}/ci/deploy.sh \
-l ${LAB_NAME} -p ${POD_NAME} -s ${DEPLOY_SCENARIO} \
-S ${TMPDIR} ${EXTRA_ARGS:-} \
-L ${WORKSPACE}/${FUEL_LOG_FILENAME}"
diff --git a/jjb/fuel/fuel-docker-jobs.yaml b/jjb/fuel/fuel-docker-jobs.yaml
index 98ed66da7..4967de55d 100644
--- a/jjb/fuel/fuel-docker-jobs.yaml
+++ b/jjb/fuel/fuel-docker-jobs.yaml
@@ -119,7 +119,7 @@
*)
tag="{stream}" ;;
esac
- sudo ./ci/build.sh $tag
+ ./ci/build.sh $tag
- job-template:
name: 'fuel-docker-manifest-{stream}'