Skip to content

Commit ca57a01

Browse files
committed
Allow user to specify AZURE_CLOUD_PROVIDER_ROOT when running ci-entrypoint locally
Signed-off-by: Mark Rossetti <[email protected]>
1 parent f50dfac commit ca57a01

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

scripts/ci-build-azure-ccm.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,18 @@ export CNM_IMAGE_NAME=azure-cloud-node-manager
3838
export WINDOWS_IMAGE_VERSION=1809
3939
declare -a IMAGES=("${CCM_IMAGE_NAME}" "${CNM_IMAGE_NAME}")
4040

41+
4142
setup() {
42-
AZURE_CLOUD_PROVIDER_ROOT="$(go env GOPATH)/src/sigs.k8s.io/cloud-provider-azure"
43-
export AZURE_CLOUD_PROVIDER_ROOT
43+
AZURE_CLOUD_PROVIDER_ROOT="${AZURE_CLOUD_PROVIDER_ROOT:-""}"
44+
if [[ -z "${AZURE_CLOUD_PROVIDER_ROOT}" ]]; then
45+
AZURE_CLOUD_PROVIDER_ROOT="$(go env GOPATH)/src/sigs.k8s.io/cloud-provider-azure"
46+
export AZURE_CLOUD_PROVIDER_ROOT
47+
fi
48+
4449
# the azure-cloud-provider repo expects IMAGE_REGISTRY.
4550
export IMAGE_REGISTRY=${REGISTRY}
4651
pushd "${AZURE_CLOUD_PROVIDER_ROOT}" && IMAGE_TAG=$(git rev-parse --short=7 HEAD) && export IMAGE_TAG && popd
52+
echo "Image registry is ${REGISTRY}"
4753
echo "Image Tag is ${IMAGE_TAG}"
4854

4955
if [[ -n "${WINDOWS_SERVER_VERSION:-}" ]]; then

0 commit comments

Comments
 (0)