Cleanup (followup for ccache addition) (#28702)

* nit in python interop dockerfile * address TODO in prepare_ccache_symlinks_rc * enable ccache for C# and ruby distribtest jobs * use debian11 instead of bullseye consistently
3 years ago · b0cdd3cba2
parent 890a9de53e
commit b0cdd3cba2
14 changed files with 19 additions and 13 deletions
--- a/templates/tools/dockerfile/grpc_clang_format/Dockerfile.template
+++ b/templates/tools/dockerfile/grpc_clang_format/Dockerfile.template
@ -14,7 +14,7 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.

-  FROM debian:bullseye
+  FROM debian:11

  # Install clang-format
  RUN apt-get update && apt-get install -y clang-format-11
--- a/templates/tools/dockerfile/grpc_clang_tidy/Dockerfile.template
+++ b/templates/tools/dockerfile/grpc_clang_tidy/Dockerfile.template
@ -14,7 +14,7 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
-  FROM debian:bullseye
+  FROM debian:11
  
  # Install clang-tidy 11
  RUN apt-get update && apt-get install -y clang-tidy-11 jq git
--- a/templates/tools/dockerfile/grpc_iwyu/Dockerfile.template
+++ b/templates/tools/dockerfile/grpc_iwyu/Dockerfile.template
@ -14,7 +14,7 @@
  # See the License for the specific language governing permissions and
  # limitations under the License.
  
-  FROM debian:bullseye
+  FROM debian:11
  
  RUN apt-get update && apt-get install -y clang-11 llvm-11-dev libclang-11-dev clang-format-11 jq git cmake python
  
--- a/templates/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile.template
+++ b/templates/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile.template
@ -22,4 +22,4 @@
  <%include file="../../gcp_api_libraries.include"/>

  <%include file="../../cmake.include"/>
-  <%include file="../../ccache.include"/>
+  <%include file="../../ccache.include"/>
--- a/templates/tools/dockerfile/python_debian11_base.include
+++ b/templates/tools/dockerfile/python_debian11_base.include
@ -1,4 +1,4 @@
-FROM debian:bullseye
+FROM debian:11
  
 <%include file="./apt_get_basic.include"/>
 <%include file="./run_tests_addons.include"/>
--- a/tools/dockerfile/grpc_clang_format/Dockerfile
+++ b/tools/dockerfile/grpc_clang_format/Dockerfile
@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-FROM debian:bullseye
+FROM debian:11

 # Install clang-format
 RUN apt-get update && apt-get install -y clang-format-11
--- a/tools/dockerfile/grpc_clang_tidy/Dockerfile
+++ b/tools/dockerfile/grpc_clang_tidy/Dockerfile
@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-FROM debian:bullseye
+FROM debian:11

 # Install clang-tidy 11
 RUN apt-get update && apt-get install -y clang-tidy-11 jq git
--- a/tools/dockerfile/grpc_iwyu/Dockerfile
+++ b/tools/dockerfile/grpc_iwyu/Dockerfile
@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-FROM debian:bullseye
+FROM debian:11

 RUN apt-get update && apt-get install -y clang-11 llvm-11-dev libclang-11-dev clang-format-11 jq git cmake python

--- a/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile
+++ b/tools/dockerfile/interoptest/grpc_interop_python/Dockerfile
@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-FROM debian:bullseye
+FROM debian:11
  
 #=================
 # Basic C core dependencies
@ -87,3 +87,4 @@ RUN curl -sSL -o ccache.tar.gz https://github.com/ccache/ccache/releases/downloa
    && make -j4 && make install \
    && cd ../.. \
    && rm -rf ccache-4.5.1 ccache.tar.gz
+
--- a/tools/dockerfile/interoptest/grpc_interop_pythonasyncio/Dockerfile
+++ b/tools/dockerfile/interoptest/grpc_interop_pythonasyncio/Dockerfile
@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-FROM debian:bullseye
+FROM debian:11
  
 #=================
 # Basic C core dependencies
--- a/tools/dockerfile/test/python_debian11_default_x64/Dockerfile
+++ b/tools/dockerfile/test/python_debian11_default_x64/Dockerfile
@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-FROM debian:bullseye
+FROM debian:11
  
 #=================
 # Basic C core dependencies
--- a/tools/internal_ci/helper_scripts/prepare_ccache_symlinks_rc
+++ b/tools/internal_ci/helper_scripts/prepare_ccache_symlinks_rc
@ -15,8 +15,7 @@

 # Source this rc script to create symlinks to ccache

-# TODO: handle values like "0", "false" etc.
-if [ "${GRPC_BUILD_ENABLE_CCACHE}" != "" ]
+if [ "${GRPC_BUILD_ENABLE_CCACHE}" != "" ] && [ "${GRPC_BUILD_ENABLE_CCACHE}" != "false" ] && [ "${GRPC_BUILD_ENABLE_CCACHE}" != "0" ]
 then
  if [ -x "$(command -v ccache)" ]
  then
--- a/tools/internal_ci/linux/grpc_distribtests_csharp.sh
+++ b/tools/internal_ci/linux/grpc_distribtests_csharp.sh
@ -28,6 +28,9 @@ source tools/internal_ci/helper_scripts/prepare_build_linux_rc
 # under qemu emulator.
 source tools/internal_ci/helper_scripts/prepare_qemu_rc

+# configure ccache
+source tools/internal_ci/helper_scripts/prepare_ccache_rc
+
 # Build all C# linux artifacts
 tools/run_tests/task_runner.py -f artifact linux csharp ${TASK_RUNNER_EXTRA_FILTERS} -j 4 --inner_jobs 8 -x build_artifacts_csharp/sponge_log.xml || FAILED="true"

--- a/tools/internal_ci/linux/grpc_distribtests_ruby.sh
+++ b/tools/internal_ci/linux/grpc_distribtests_ruby.sh
@ -26,6 +26,9 @@ source tools/internal_ci/helper_scripts/prepare_build_linux_rc
 # prerequisites for ruby artifact build on linux
 source tools/internal_ci/helper_scripts/prepare_build_linux_ruby_artifact_rc

+# configure ccache
+source tools/internal_ci/helper_scripts/prepare_ccache_rc
+
 # Build all ruby linux artifacts (this step actually builds all the binary wheels and source archives)
 tools/run_tests/task_runner.py -f artifact linux ruby ${TASK_RUNNER_EXTRA_FILTERS} -j 6 --inner_jobs 6 -x build_artifacts/sponge_log.xml || FAILED="true"