Automator: update common-files@master in istio/api@master (#2755)

istio · Apr 10, 2023 · d4c0b38 · d4c0b38
1 parent 60a4392
commit d4c0b38
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
@@ -1 +1 @@
-c652fc10a113014c3755778e971603fcbfefb0fa
+b7e9c0ef62f5ed2794d894cd086a016d6b141955
diff --git a/common/Makefile.common.mk b/common/Makefile.common.mk
@@ -93,9 +93,11 @@ mirror-licenses: mod-download-go
 TMP := $(shell mktemp -d -u)
 UPDATE_BRANCH ?= "master"
 
+BUILD_TOOLS_ORG ?= "istio"
+
 update-common:
 	@mkdir -p $(TMP)
-	@git clone -q --depth 1 --single-branch --branch $(UPDATE_BRANCH) https://github.com/istio/common-files $(TMP)/common-files
+	@git clone -q --depth 1 --single-branch --branch $(UPDATE_BRANCH) https://github.com/$(BUILD_TOOLS_ORG)/common-files $(TMP)/common-files
 	@cd $(TMP)/common-files ; git rev-parse HEAD >files/common/.commonfiles.sha
 	@rm -fr common
 	@CONTRIB_OVERRIDE=$(shell grep -l "istio/community/blob/master/CONTRIBUTING.md" CONTRIBUTING.md)

diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
@@ -72,6 +72,8 @@ else
 fi
 
 # Build image to use
+TOOLS_REGISTRY_PROVIDER=${TOOLS_REGISTRY_PROVIDER:-gcr.io}
+PROJECT_ID=${PROJECT_ID:-istio-testing}
 if [[ "${IMAGE_VERSION:-}" == "" ]]; then
   IMAGE_VERSION=master-04cfef4d3b89cbc1a32f2983460724ac4f450154
 fi
@@ -89,7 +91,7 @@ TARGET_OUT_LINUX="${TARGET_OUT_LINUX:-$(pwd)/out/linux_${TARGET_ARCH}}"
 CONTAINER_TARGET_OUT="${CONTAINER_TARGET_OUT:-/work/out/${TARGET_OS}_${TARGET_ARCH}}"
 CONTAINER_TARGET_OUT_LINUX="${CONTAINER_TARGET_OUT_LINUX:-/work/out/linux_${TARGET_ARCH}}"
 
-IMG="${IMG:-gcr.io/istio-testing/${IMAGE_NAME}:${IMAGE_VERSION}}"
+IMG="${IMG:-${TOOLS_REGISTRY_PROVIDER}/${PROJECT_ID}/${IMAGE_NAME}:${IMAGE_VERSION}}"
 
 CONTAINER_CLI="${CONTAINER_CLI:-docker}"