This is an automated email from the ASF dual-hosted git repository. aw pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/yetus.git
commit 3a72dd9f318a27f79adbf38f378ab8ec02724a51 Author: Allen Wittenauer <[email protected]> AuthorDate: Wed Dec 26 19:56:24 2018 -0800 YETUS-735. docker-cleanup throwing errors Signed-off-by: Allen Wittenauer <[email protected]> --- precommit/src/main/shell/robots.d/circleci.sh | 3 ++- precommit/src/main/shell/robots.d/gitlabci.sh | 3 ++- precommit/src/main/shell/robots.d/jenkins.sh | 3 ++- precommit/src/main/shell/robots.d/travisci.sh | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/precommit/src/main/shell/robots.d/circleci.sh b/precommit/src/main/shell/robots.d/circleci.sh index ec250c9..bc05dd6 100755 --- a/precommit/src/main/shell/robots.d/circleci.sh +++ b/precommit/src/main/shell/robots.d/circleci.sh @@ -18,7 +18,8 @@ # SHELLDOC-IGNORE # shellcheck disable=2034 -if [[ "${CIRCLECI}" = true ]]; then +if [[ "${CIRCLECI}" = true ]] && + declare -f compile_cycle >/dev/null; then if [[ ${CIRCLE_REPOSITORY_URL} =~ github.com ]]; then # github artifacts show up like so: #BUILD_URL_ARTIFACTS=https://circle-artifacts.com/gh/username/repo/buildnum/artifacts/0/dir/file diff --git a/precommit/src/main/shell/robots.d/gitlabci.sh b/precommit/src/main/shell/robots.d/gitlabci.sh index cafcde4..9e99b84 100755 --- a/precommit/src/main/shell/robots.d/gitlabci.sh +++ b/precommit/src/main/shell/robots.d/gitlabci.sh @@ -18,7 +18,8 @@ # SHELLDOC-IGNORE # shellcheck disable=2034 -if [[ "${GITLAB_CI}" = true ]]; then +if [[ "${GITLAB_CI}" = true ]] && + declare -f compile_cycle >/dev/null; then CONSOLE_USE_BUILD_URL=true PATCH_DIR=/tmp/yetus-out RELOCATE_PATCH_DIR=true diff --git a/precommit/src/main/shell/robots.d/jenkins.sh b/precommit/src/main/shell/robots.d/jenkins.sh index b39e95b..3d959a5 100755 --- a/precommit/src/main/shell/robots.d/jenkins.sh +++ b/precommit/src/main/shell/robots.d/jenkins.sh @@ -20,7 +20,8 @@ # we need two for Jenkins because users may # use the jenkins-cli which will also read JENKINS_URL # shellcheck disable=SC2034 -if [[ -n "${JENKINS_URL}" && -n "${EXECUTOR_NUMBER}" ]]; then +if [[ -n "${JENKINS_URL}" && -n "${EXECUTOR_NUMBER}" ]] && + declare -f compile_cycle >/dev/null; then ROBOT=true INSTANCE=${EXECUTOR_NUMBER} ROBOTTYPE=jenkins diff --git a/precommit/src/main/shell/robots.d/travisci.sh b/precommit/src/main/shell/robots.d/travisci.sh index 9071ffa..7c066e3 100755 --- a/precommit/src/main/shell/robots.d/travisci.sh +++ b/precommit/src/main/shell/robots.d/travisci.sh @@ -16,7 +16,8 @@ # SHELLDOC-IGNORE -if [[ "${TRAVIS}" == true ]]; then +if [[ "${TRAVIS}" == true ]] && + declare -f compile_cycle >/dev/null; then # shellcheck disable=SC2034 ROBOT=true
