diff options
| -rwxr-xr-x | tools/run_build.sh | 8 | ||||
| -rwxr-xr-x | tools/run_tests.sh | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/tools/run_build.sh b/tools/run_build.sh index b6b446690..d49a1d4be 100755 --- a/tools/run_build.sh +++ b/tools/run_build.sh @@ -23,9 +23,11 @@ set -x (which use_bazel.sh && use_bazel.sh latest) || which bazel bazel version -# Switch into the workspace and checkout the appropriate commit. -if [[ -v KOKORO_GIT_COMMIT ]]; then - cd git/repo && git checkout "${KOKORO_GIT_COMMIT}" +# Switch into the workspace. +if [[ -v KOKORO_GIT_COMMIT ]] && [[ -d git/repo ]]; then + cd git/repo +elif [[ -v KOKORO_GIT_COMMIT ]] && [[ -d github/repo ]]; then + cd github/repo fi # Build runsc. diff --git a/tools/run_tests.sh b/tools/run_tests.sh index c6e97dc95..dc282c142 100755 --- a/tools/run_tests.sh +++ b/tools/run_tests.sh @@ -21,8 +21,10 @@ set -eux # GLOBAL ENV VARS # ################### -if [[ -v KOKORO_GIT_COMMIT ]]; then +if [[ -v KOKORO_GIT_COMMIT ]] && [[ -d git/repo ]]; then readonly WORKSPACE_DIR="${PWD}/git/repo" +elif [[ -v KOKORO_GIT_COMMIT ]] && [[ -d github/repo ]]; then + readonly WORKSPACE_DIR="${PWD}/github/repo" else readonly WORKSPACE_DIR="${PWD}" fi @@ -46,11 +48,6 @@ readonly TEST_PACKAGES=("//pkg/..." "//runsc/..." "//tools/...") (which use_bazel.sh && use_bazel.sh latest) || which bazel bazel version -# Checkout the appropriate commit. -if [[ -v KOKORO_GIT_COMMIT ]]; then - (cd "${WORKSPACE_DIR}" && git checkout "${KOKORO_GIT_COMMIT}") -fi - # Load the kvm module. sudo -n -E modprobe kvm |