diff --git a/test/images/cloudbuild.yaml b/test/images/cloudbuild.yaml index 0408b7e891b..9384694338f 100644 --- a/test/images/cloudbuild.yaml +++ b/test/images/cloudbuild.yaml @@ -9,6 +9,23 @@ options: substitution_option: ALLOW_LOOSE machineType: 'N1_HIGHCPU_8' steps: + - name: gcr.io/cloud-builders/gcloud + entrypoint: 'bash' + # NOTE(claudiub): We need to get the ca.pem, cert.pem, key.pem files and put create the + # /certs/.docker-1809/, /certs/.docker-1903/, /certs/.docker-1909/ folders, which will contain the files. + args: + - -c + - | + mkdir -p .docker-windows + gcloud secrets versions access latest --project=k8s-infra-prow-build-trusted --secret=windows-remote-docker_ca-pem > .docker-windows/ca.pem + gcloud secrets versions access latest --project=k8s-infra-prow-build-trusted --secret=windows-remote-docker_cert-pem > .docker-windows/cert.pem + gcloud secrets versions access latest --project=k8s-infra-prow-build-trusted --secret=windows-remote-docker_key-pem > .docker-windows/key.pem + cp -r .docker-windows /certs/.docker-1809 + cp -r .docker-windows /certs/.docker-1903 + cp -r .docker-windows /certs/.docker-1909 + volumes: + - name: 'certs' + path: '/certs' - name: 'gcr.io/k8s-testimages/gcb-docker-gcloud:v20190906-745fed4' entrypoint: make dir: ./test/images/ @@ -18,13 +35,15 @@ steps: - BASE_REF=$_PULL_BASE_REF - WHAT=$_WHAT - REGISTRY=gcr.io/k8s-staging-e2e-test-images - - DOCKER_CERT_BASE_PATH=/root + - DOCKER_CERT_BASE_PATH=/certs - REMOTE_DOCKER_URL_1809=tcp://img-promoter-1809.eastus.cloudapp.azure.com:2376 - REMOTE_DOCKER_URL_1903=tcp://img-promoter-1903.eastus.cloudapp.azure.com:2376 - REMOTE_DOCKER_URL_1909=tcp://img-promoter-1909.eastus.cloudapp.azure.com:2376 - # TODO(claudiub): Readd the REMOTE_DOCKER_URL_${os_version} to reenable the Windows test image building process. args: - all-build-and-push + volumes: + - name: 'certs' + path: '/certs' 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