From: Aric Gardner <agardner@linuxfoundation.org>
Date: Wed, 26 Sep 2018 16:42:19 +0000 (+0000)
Subject: Merge "Increase functest job timeout"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1c76d923e2800d063d09c61bb73c06b6a495dcd0;hp=edb3bdc72264e1cd385f5aca62779f0ed73def9e;p=releng.git

Merge "Increase functest job timeout"
---

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}'