More cleanup after moving testing docker images to artifact registry. (#31689)

* remove DOCKERHUB_ORGANIZATION from prepare_build_interop_rc

* switch rubys rake-compiler-dock to .current_version files

* remove DOCKERHUB_ORGANIZATION from prepare_build_linux_rc

* fix .current_version files for third_party/rake-compiler-dock

* fix: avoid .current_version files named */.current_version

* fix: avoid pushing in local only mode

tools/distrib/rake_compiler_docker_image.rb

@@ -20,11 +20,10 @@ end
 def docker_image_for_rake_compiler(platform)
   require 'digest'
 
-  dockerfile = File.join(grpc_root, 'third_party', 'rake-compiler-dock', 'rake_' + platform, 'Dockerfile')
+  dockerfile_dir = File.join(grpc_root, 'third_party', 'rake-compiler-dock', 'rake_' + platform)
-  dockerpath = File.dirname(dockerfile)
+  # the ".current_version" file contains image name, tag and sha256 digest
-  version = Digest::SHA1.file(dockerfile).hexdigest
+  current_version_file = dockerfile_dir + '.current_version'
-  image_name = 'rake_' + platform + ':' + version
+  image_name = File.read(current_version_file)
-  ENV.fetch('DOCKERHUB_ORGANIZATION', 'grpctesting') + '/' + image_name
 end
 
 def run_rake_compiler(platform, args)

tools/dockerfile/push_testing_images.sh

@@ -62,7 +62,7 @@ ALL_DOCKERFILE_DIRS=(
   tools/dockerfile/grpc_artifact_*
   tools/dockerfile/interoptest/*
   tools/dockerfile/distribtest/*
-  third_party/rake-compiler-dock/*/
+  third_party/rake-compiler-dock/*
 )
 
 CHECK_FAILED=""
@@ -167,7 +167,7 @@ do
   # update info on what we consider to be the current version of the docker image (which will be used to run tests)
   echo -n "${ARTIFACT_REGISTRY_PREFIX}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}@${DOCKER_IMAGE_DIGEST_LOCAL}" >${DOCKERFILE_DIR}.current_version
 
-  if [ "${SKIP_UPLOAD}" == "" ] && [ "${LOCAL_ONLY_MODE}" != "" ]
+  if [ "${SKIP_UPLOAD}" == "" ] && [ "${LOCAL_ONLY_MODE}" == "" ]
   then
     docker push ${ARTIFACT_REGISTRY_PREFIX}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}
   fi

tools/internal_ci/helper_scripts/prepare_build_interop_rc

@@ -18,9 +18,6 @@
 
 export LANG=en_US.UTF-8
 
-# Download Docker images from DockerHub
-export DOCKERHUB_ORGANIZATION=grpctesting
-
 git submodule update --init
 
 # Clone repositories for languages tested by the interop test suite

tools/internal_ci/helper_scripts/prepare_build_linux_rc

@@ -36,9 +36,6 @@ else
   sudo service docker restart
 fi
 
-# Download Docker images from DockerHub
-export DOCKERHUB_ORGANIZATION=grpctesting
-
 git submodule update --init
 
 python3 -m pip install six

tools/run_tests/artifacts/build_artifact_ruby.sh

@@ -47,9 +47,6 @@ gem list || true
 export BUNDLE_PATH=bundle_local_gems
 tools/run_tests/helper_scripts/bundle_install_wrapper.sh
 
-# set the dockerhub org under which all the gRPC's ruby-compiler-dock docker images
-# are available.
-export DOCKERHUB_ORGANIZATION=grpctesting
 bundle exec rake "gem:native[${GEM_PLATFORM}]"
 
 if [ "$SYSTEM" == "Darwin" ] ; then