diff --git a/cloudbuild-kubepkg.yaml b/cloudbuild-kubepkg.yaml index 571d9f664e2..282bff88d09 100644 --- a/cloudbuild-kubepkg.yaml +++ b/cloudbuild-kubepkg.yaml @@ -8,22 +8,23 @@ steps: - build - -f - ./Dockerfile-kubepkg - - --tag=gcr.io/$PROJECT_ID/kubepkg:$_GIT_TAG - - --tag=gcr.io/$PROJECT_ID/kubepkg:latest + - --tag=$_REGISTRY/kubepkg:$_GIT_TAG + - --tag=$_REGISTRY/kubepkg:latest - . - name: gcr.io/cloud-builders/docker args: - build - -f - ./Dockerfile-kubepkg-rpm - - --tag=gcr.io/$PROJECT_ID/kubepkg-rpm:$_GIT_TAG - - --tag=gcr.io/$PROJECT_ID/kubepkg-rpm:latest + - --tag=$_REGISTRY/kubepkg-rpm:$_GIT_TAG + - --tag=$_REGISTRY/kubepkg-rpm:latest - . substitutions: # _GIT_TAG will be filled with a git-based tag for the image, of the form vYYYYMMDD-hash, and # can be used as a substitution _GIT_TAG: '12345' _PULL_BASE_REF: 'dev' + _REGISTRY: 'fake.repository/registry-name' images: - 'gcr.io/$PROJECT_ID/kubepkg:$_GIT_TAG' - 'gcr.io/$PROJECT_ID/kubepkg:latest' diff --git a/images/releng/ci/cloudbuild.yaml b/images/releng/ci/cloudbuild.yaml index 5a6e166629a..24bdf4334e1 100644 --- a/images/releng/ci/cloudbuild.yaml +++ b/images/releng/ci/cloudbuild.yaml @@ -8,16 +8,16 @@ steps: dir: ./images/releng/ci args: - build - - --tag=gcr.io/$PROJECT_ID/releng-ci:$_GIT_TAG - - --tag=gcr.io/$PROJECT_ID/releng-ci:$_IMAGE_VERSION - - --tag=gcr.io/$PROJECT_ID/releng-ci:latest + - --tag=$_REGISTRY/releng-ci:$_GIT_TAG + - --tag=$_REGISTRY/releng-ci:$_IMAGE_VERSION + - --tag=$_REGISTRY/releng-ci:latest - --build-arg=GO_VERSION=${_GO_VERSION} - . - name: gcr.io/gcp-runtimes/container-structure-test dir: ./images/releng/ci args: - test - - --image=gcr.io/$PROJECT_ID/releng-ci:latest + - --image=$_REGISTRY/releng-ci:latest - --config=test.yaml substitutions: # _GIT_TAG will be filled with a git-based tag for the image, of the form @@ -26,6 +26,7 @@ substitutions: _PULL_BASE_REF: 'dev' _IMAGE_VERSION: 'v0.5.0' _GO_VERSION: '1.16.1' + _REGISTRY: 'fake.repository/registry-name' images: - 'gcr.io/$PROJECT_ID/releng-ci:${_GIT_TAG}' - 'gcr.io/$PROJECT_ID/releng-ci:${_IMAGE_VERSION}' diff --git a/images/releng/k8s-ci-builder/cloudbuild.yaml b/images/releng/k8s-ci-builder/cloudbuild.yaml index d6d19ed86f9..0d4ef36b709 100644 --- a/images/releng/k8s-ci-builder/cloudbuild.yaml +++ b/images/releng/k8s-ci-builder/cloudbuild.yaml @@ -16,7 +16,8 @@ steps: dir: ./images/releng/k8s-ci-builder env: - DOCKER_CLI_EXPERIMENTAL=enabled - - REGISTRY=gcr.io/$PROJECT_ID + - REGISTRY=$_REGISTRY + - IMAGE_ARG='$_REGISTRY/k8s-ci-builder:${_GIT_TAG}-${_CONFIG}' - HOME=/root - TAG=${_GIT_TAG} - PULL_BASE_REF=${_PULL_BASE_REF} @@ -24,7 +25,6 @@ steps: - GO_VERSION=${_GO_VERSION} - BAZEL_VERSION=${_BAZEL_VERSION} - OLD_BAZEL_VERSION=${_OLD_BAZEL_VERSION} - - IMAGE_ARG='gcr.io/$PROJECT_ID/k8s-ci-builder:${_GIT_TAG}-${_CONFIG}' - SKOPEO_VERSION=${_SKOPEO_VERSION} args: - '-c' @@ -42,6 +42,7 @@ substitutions: _BAZEL_VERSION: '0.0.0' _OLD_BAZEL_VERSION: '0.0.0' _SKOPEO_VERSION: 'v0.0.0' + _REGISTRY: 'fake.repository/registry-name' tags: - 'k8s-ci-builder'