revert to workspace PWD was used for local testing

This commit is contained in:
thelamer 2019-03-12 21:03:03 -07:00
parent b0b9c1ccc9
commit e25f15d40d

View File

@ -4,51 +4,51 @@
unset MOUNT_OPTIONS TEST_AREA LINT_ARCH SHELLCHECK_OPTIONS
# clear preexising checkstyle files
[[ -f "${PWD}"/shellcheck-result.xml ]] && rm "${PWD}"/shellcheck-result.xml
[[ -f "${WORKSPACE}"/shellcheck-result.xml ]] && rm "${WORKSPACE}"/shellcheck-result.xml
# check for common locations and exit if not found
if [[ ! -d "${PWD}"/root/etc/cont-init.d && ! -d "${PWD}"/root/etc/services.d && \
! -d "${PWD}"/init && ! -d "${PWD}"/services ]]; then
if [[ ! -d "${WORKSPACE}"/root/etc/cont-init.d && ! -d "${WORKSPACE}"/root/etc/services.d && \
! -d "${WORKSPACE}"/init && ! -d "${WORKSPACE}"/services ]]; then
echo "no common files found, linting not required" exit 0
fi
if [[ ! -d "${PWD}"/root/etc/cont-init.d && ! -d "${PWD}"/root/etc/services.d ]] && \
[[ -d "${PWD}"/init && -d "${PWD}"/services ]]; then
if [[ ! -d "${WORKSPACE}"/root/etc/cont-init.d && ! -d "${WORKSPACE}"/root/etc/services.d ]] && \
[[ -d "${WORKSPACE}"/init && -d "${WORKSPACE}"/services ]]; then
SHELLCHECK_OPTIONS="--format=checkstyle --shell=bash"
MOUNT_OPTIONS="-v ${PWD}/init:/init -v ${PWD}/services:/services"
MOUNT_OPTIONS="-v ${WORKSPACE}/init:/init -v ${WORKSPACE}/services:/services"
TEST_AREA="init services"
elif [[ ! -d "${PWD}"/root/etc/cont-init.d && ! -d "${PWD}"/root/etc/services.d ]] && \
[[ ! -d "${PWD}"/init && -d "${PWD}"/services ]]; then
elif [[ ! -d "${WORKSPACE}"/root/etc/cont-init.d && ! -d "${WORKSPACE}"/root/etc/services.d ]] && \
[[ ! -d "${WORKSPACE}"/init && -d "${WORKSPACE}"/services ]]; then
SHELLCHECK_OPTIONS="--format=checkstyle --shell=bash"
MOUNT_OPTIONS="-v ${PWD}/services:/services"
MOUNT_OPTIONS="-v ${WORKSPACE}/services:/services"
TEST_AREA="services"
elif [[ ! -d "${PWD}"/root/etc/cont-init.d && ! -d "${PWD}"/root/etc/services.d ]] && \
[[ -d "${PWD}"/init && ! -d "${PWD}"/services ]]; then
elif [[ ! -d "${WORKSPACE}"/root/etc/cont-init.d && ! -d "${WORKSPACE}"/root/etc/services.d ]] && \
[[ -d "${WORKSPACE}"/init && ! -d "${WORKSPACE}"/services ]]; then
SHELLCHECK_OPTIONS="--format=checkstyle --shell=bash"
MOUNT_OPTIONS="-v ${PWD}/init:/init"
MOUNT_OPTIONS="-v ${WORKSPACE}/init:/init"
TEST_AREA="init"
elif [[ -d "${PWD}"/root/etc/cont-init.d && -d "${PWD}"/root/etc/services.d ]]; then
elif [[ -d "${WORKSPACE}"/root/etc/cont-init.d && -d "${WORKSPACE}"/root/etc/services.d ]]; then
SHELLCHECK_OPTIONS="--exclude=SC1008 --format=checkstyle --shell=bash"
MOUNT_OPTIONS="-v ${PWD}/root:/root"
MOUNT_OPTIONS="-v ${WORKSPACE}/root:/root"
TEST_AREA="root/etc/services.d root/etc/cont-init.d"
elif [[ ! -d "${PWD}"/root/etc/cont-init.d && -d "${PWD}"/root/etc/services.d ]]; then
elif [[ ! -d "${WORKSPACE}"/root/etc/cont-init.d && -d "${WORKSPACE}"/root/etc/services.d ]]; then
SHELLCHECK_OPTIONS="--exclude=SC1008 --format=checkstyle --shell=bash"
MOUNT_OPTIONS="-v ${PWD}/root:/root"
MOUNT_OPTIONS="-v ${WORKSPACE}/root:/root"
TEST_AREA="root/etc/services.d"
elif [[ -d "${PWD}"/root/etc/cont-init.d && ! -d "${PWD}"/root/etc/services.d ]]; then
elif [[ -d "${WORKSPACE}"/root/etc/cont-init.d && ! -d "${WORKSPACE}"/root/etc/services.d ]]; then
SHELLCHECK_OPTIONS="--exclude=SC1008 --format=checkstyle --shell=bash"
MOUNT_OPTIONS="-v ${PWD}/root:/root"
MOUNT_OPTIONS="-v ${WORKSPACE}/root:/root"
TEST_AREA="root/etc/cont-init.d"
fi
# run shellcheck
if [[ -d "${PWD}"/root/etc/cont-init.d || -d "${PWD}"/root/etc/services.d || \
-d "${PWD}"/init || -d "${PWD}"/services ]];then
if [[ -d "${WORKSPACE}"/root/etc/cont-init.d || -d "${WORKSPACE}"/root/etc/services.d || \
-d "${WORKSPACE}"/init || -d "${WORKSPACE}"/services ]];then
docker pull lsiodev/shellcheck
@ -57,11 +57,11 @@ docker run \
${MOUNT_OPTIONS} \
lsiodev/shellcheck \
find ${TEST_AREA} -type f -exec shellcheck ${SHELLCHECK_OPTIONS} {} + \
> ${PWD}/shellcheck-result.xml
> ${WORKSPACE}/shellcheck-result.xml
fi
[[ ! -f ${PWD}/shellcheck-result.xml ]] && echo "<?xml version='1.0' encoding='UTF-8'?><checkstyle version='4.3'></checkstyle>" > ${PWD}/shellcheck-result.xml
[[ ! -f ${WORKSPACE}/shellcheck-result.xml ]] && echo "<?xml version='1.0' encoding='UTF-8'?><checkstyle version='4.3'></checkstyle>" > ${WORKSPACE}/shellcheck-result.xml
# exit gracefully
exit 0