Merge pull request #201 from lpiwowar/fix/to-sudo

Remove unnecessary sudo calls

Author: openshift-merge-bot[bot]

container-images/tcib/base/os/horizontest/run_horizontest.sh

@@ -33,7 +33,7 @@ function clean_leftover_images {
 function create_custom_resources {
     if ! openstack image show --os-cloud default ${IMAGE_FILE_NAME} ; then
         if [ ! -f "$IMAGE_FILE" ]; then
-            sudo curl -o "$IMAGE_FILE" -OL ${IMAGE_URL}
+            curl -o "$IMAGE_FILE" -OL ${IMAGE_URL}
         fi
         openstack image create \
                 --os-cloud default \
@@ -102,7 +102,7 @@ function delete_custom_resources {
 
 pushd ${HORIZONTEST_DIR}
 git clone ${REPO_URL} ${HORIZONTEST_DIR}/horizon
-sudo chown -R horizontest:horizontest horizon
+chown -R horizontest:horizontest horizon
 pushd horizon
 git pull --rebase
 git checkout ${HORIZON_REPO_BRANCH}
@@ -137,7 +137,7 @@ RETURN_VALUE=$?
 echo "Copying logs file"
 LOG_DIR=${HORIZONTEST_DIR}/external_files/${HORIZON_LOGS_DIR_NAME}/
 mkdir -p ${LOG_DIR}
-sudo cp -rf ${HORIZONTEST_DIR}/horizon/test_reports/* ${LOG_DIR}
+cp -rf ${HORIZONTEST_DIR}/horizon/test_reports/* ${LOG_DIR}
 
 delete_custom_resources
 

container-images/tcib/base/os/tempest/run_tempest.sh

@@ -229,7 +229,7 @@ function upload_extra_images {
             image_create_params=()
 
             [[ ! -f "${TEMPEST_EXTRA_IMAGES_NAME[image_index]}" ]] && \
-                sudo curl -o "${TEMPEST_EXTRA_IMAGES_NAME[image_index]}" "${TEMPEST_EXTRA_IMAGES_URL[image_index]}"
+                curl -o "${HOMEDIR}/${TEMPEST_EXTRA_IMAGES_NAME[image_index]}" "${TEMPEST_EXTRA_IMAGES_URL[image_index]}"
 
             [[ ${TEMPEST_EXTRA_IMAGES_DISK_FORMAT[image_index]} != "-" ]] && \
                 image_create_params+=(--disk-format ${TEMPEST_EXTRA_IMAGES_DISK_FORMAT[image_index]})
@@ -241,7 +241,7 @@ function upload_extra_images {
                 image_create_params+=(--id ${TEMPEST_EXTRA_IMAGES_ID[image_index]})
 
             [[ ${TEMPEST_EXTRA_IMAGES_NAME[image_index]} != "-" ]] && \
-                image_create_params+=(--file ${TEMPEST_EXTRA_IMAGES_NAME[image_index]})
+                image_create_params+=(--file "${HOMEDIR}/${TEMPEST_EXTRA_IMAGES_NAME[image_index]}")
 
             [[ ${TEMPEST_EXTRA_IMAGES_CONTAINER_FORMAT[image_index]} != "-" ]] && \
                 image_create_params+=(--container-format ${TEMPEST_EXTRA_IMAGES_CONTAINER_FORMAT[image_index]})
@@ -410,9 +410,9 @@ fi
 if [ -f ${HOMEDIR}/id_ecdsa ]; then
     mkdir -p ${HOMEDIR}/.ssh
     cp ${HOMEDIR}/id_ecdsa ${HOMEDIR}/.ssh/id_ecdsa
-    sudo chmod 700 ${HOMEDIR}/.ssh
-    sudo chmod 600 ${HOMEDIR}/.ssh/id_ecdsa
-    sudo chown -R tempest:tempest ${HOMEDIR}/.ssh
+    chmod 700 ${HOMEDIR}/.ssh
+    chmod 600 ${HOMEDIR}/.ssh/id_ecdsa
+    chown -R tempest:tempest ${HOMEDIR}/.ssh
 fi
 
 if [ -z $TEMPEST_EXTERNAL_PLUGIN_GIT_URL ]; then

container-images/tcib/base/tobiko/run_tobiko.sh

@@ -34,7 +34,7 @@ TOBIKO_LOGS_DIR_NAME=${TOBIKO_LOGS_DIR_NAME:-"tobiko"}
 [ ! -z ${TOBIKO_NUM_PROCESSES} ] && export TOX_NUM_PROCESSES=${TOBIKO_NUM_PROCESSES}
 
 pushd ${TOBIKO_DIR}
-sudo chown tobiko:tobiko -R tobiko
+chown tobiko:tobiko -R tobiko
 pushd tobiko
 [ ! -z ${TOBIKO_UPDATE_REPO} ] && git pull --rebase
 git checkout ${TOBIKO_VERSION}
@@ -47,8 +47,8 @@ if [ ! -z ${USE_EXTERNAL_FILES} ]; then
     fi
     if [ -f ${TOBIKO_KEYS_FOLDER}/${TOBIKO_PRIVATE_KEY_FILE} ]; then
         mkdir -p $TOBIKO_DIR/.ssh
-        sudo cp ${TOBIKO_KEYS_FOLDER}/${TOBIKO_PRIVATE_KEY_FILE}* $TOBIKO_DIR/.ssh/
-        sudo chown tobiko:tobiko $TOBIKO_DIR/.ssh/${TOBIKO_PRIVATE_KEY_FILE}*
+        cp ${TOBIKO_KEYS_FOLDER}/${TOBIKO_PRIVATE_KEY_FILE}* $TOBIKO_DIR/.ssh/
+        chown tobiko:tobiko $TOBIKO_DIR/.ssh/${TOBIKO_PRIVATE_KEY_FILE}*
     fi
     [ -f $TOBIKO_DIR/external_files/tobiko.conf ] && cp $TOBIKO_DIR/external_files/tobiko.conf .
 fi
@@ -62,11 +62,11 @@ if [ ! -z ${USE_EXTERNAL_FILES} ]; then
     echo "Copying logs file"
     TOBIKO_TESTENV_ARR=($TOBIKO_TESTENV)
     LOG_DIR=${TOX_REPORT_DIR:-/var/lib/tobiko/tobiko/.tox/${TOBIKO_TESTENV_ARR}/log}
-    sudo cp -rf ${LOG_DIR} ${TOBIKO_DIR}/external_files/${TOBIKO_LOGS_DIR_NAME}/
+    cp -rf ${LOG_DIR} ${TOBIKO_DIR}/external_files/${TOBIKO_LOGS_DIR_NAME}/
     if [ -f tobiko.conf ]; then
-        sudo cp tobiko.conf ${TOBIKO_DIR}/external_files/${TOBIKO_LOGS_DIR_NAME}/
+        cp tobiko.conf ${TOBIKO_DIR}/external_files/${TOBIKO_LOGS_DIR_NAME}/
     elif [ -f /etc/tobiko/tobiko.conf ]; then
-        sudo cp /etc/tobiko/tobiko.conf ${TOBIKO_DIR}/external_files/${TOBIKO_LOGS_DIR_NAME}/
+        cp /etc/tobiko/tobiko.conf ${TOBIKO_DIR}/external_files/${TOBIKO_LOGS_DIR_NAME}/
     fi
 fi