diff options
| author |  Mehrdad Afshari <mmx@google.com> | 2018-02-22 22:28:14 -0800 |
|---|---|---|
| committer | Mehrdad Afshari <mmx@google.com> | 2018-02-22 23:11:31 -0800 |
| commit | 5b0685b6c286489dd8cd39611e7409df09ccf52e (patch) | |
| tree | 0a3c53a77410c7865d4ee6119f7232f0ab2e7154 | |
| parent | deae9d85639642e32f8a3e9e9228d8a97f0a80bc (diff) | |
Fix submodule handling in dockerized tests
| -rwxr-xr-x | tools/run_tests/dockerize/docker_run.sh | 1 | ||||
| -rwxr-xr-x | tools/run_tests/dockerize/docker_run_tests.sh | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/run_tests/dockerize/docker_run.sh b/tools/run_tests/dockerize/docker_run.sh index b19cc2519a..e525019c44 100755 --- a/tools/run_tests/dockerize/docker_run.sh +++ b/tools/run_tests/dockerize/docker_run.sh @@ -26,6 +26,7 @@ then # TODO: figure out a way to eliminate this following shellcheck suppressions # shellcheck disable=SC2016,SC1004 (cd "${EXTERNAL_GIT_ROOT}" && git submodule foreach 'git clone ${EXTERNAL_GIT_ROOT}/${name} /var/local/git/grpc/${name}') + (cd /var/local/git/grpc && git submodule init) else mkdir -p "/var/local/git/grpc/$RELATIVE_COPY_PATH" cp -r "$EXTERNAL_GIT_ROOT/$RELATIVE_COPY_PATH"/* "/var/local/git/grpc/$RELATIVE_COPY_PATH" diff --git a/tools/run_tests/dockerize/docker_run_tests.sh b/tools/run_tests/dockerize/docker_run_tests.sh index 4e4ca181f4..c41734c92d 100755 --- a/tools/run_tests/dockerize/docker_run_tests.sh +++ b/tools/run_tests/dockerize/docker_run_tests.sh @@ -26,8 +26,9 @@ mkdir -p /var/local/git git clone /var/local/jenkins/grpc /var/local/git/grpc # clone gRPC submodules, use data from locally cloned submodules where possible # TODO: figure out a way to eliminate this shellcheck suppression: -# shellcheck disable=SC2016,SC1004 -(cd /var/local/jenkins/grpc/ && git submodule foreach 'git clone /var/local/jenkins/grpc/{$name} /var/local/jenkins/grpc/${name}') +# shellcheck disable=SC2016 +(cd /var/local/jenkins/grpc/ && git submodule foreach 'git clone /var/local/jenkins/grpc/${name} /var/local/git/grpc/${name}') +(cd /var/local/git/grpc/ && git submodule init) mkdir -p reports |