github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #88847 from claudiubelu/image-promoter/build-and-push

Browse Source 
Image Promoter fixes
This commit is contained in:
Kubernetes Prow Robot 2020-03-05 20:04:56 -08:00 committed by GitHub
commit 974a8a014f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/images/Makefile
View File

@ -37,4 +37,7 @@ all-container:
all-push: all-container
./image-util.sh push $(WHAT)
.PHONY: all all-push all-container
all-build-and-push:
./image-util.sh build_and_push ${WHAT}
.PHONY: all all-build-and-push all-push all-container

2
test/images/cloudbuild.yaml
View File

@ -19,7 +19,7 @@ steps:
- REGISTRY=gcr.io/k8s-staging-e2e-test-images
# TODO(claudiub): Readd the REMOTE_DOCKER_URL_${os_version} to reenable the Windows test image building process.
args:
- all-push
- all-build-and-push
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

8
test/images/image-util.sh
View File

@ -237,6 +237,14 @@ push() {
docker manifest push --purge "${REGISTRY}/${image}:${TAG}"
}
# This function is for building AND pushing images. Useful if ${WHAT} is "all-conformance".
# This will allow images to be pushed immediately after they've been pushed.
build_and_push() {
image=$1
build "${image}"
push "${image}"
}
# This function is for building the go code
bin() {
local arch_prefix=""

10
test/images/kitten/BASEIMAGE
View File

@ -1,5 +1,5 @@
linux/amd64=REGISTRY/agnhost:2.11-linux-amd64
linux/arm=REGISTRY/agnhost:2.11-linux-arm
linux/arm64=REGISTRY/agnhost:2.11-linux-arm64
linux/ppc64le=REGISTRY/agnhost:2.11-linux-ppc64le
linux/s390x=REGISTRY/agnhost:2.11-linux-s390x
linux/amd64=REGISTRY/agnhost:2.12-linux-amd64
linux/arm=REGISTRY/agnhost:2.12-linux-arm
linux/arm64=REGISTRY/agnhost:2.12-linux-arm64
linux/ppc64le=REGISTRY/agnhost:2.12-linux-ppc64le
linux/s390x=REGISTRY/agnhost:2.12-linux-s390x

10
test/images/nautilus/BASEIMAGE
View File

@ -1,5 +1,5 @@
linux/amd64=REGISTRY/agnhost:2.11-linux-amd64
linux/arm=REGISTRY/agnhost:2.11-linux-arm
linux/arm64=REGISTRY/agnhost:2.11-linux-arm64
linux/ppc64le=REGISTRY/agnhost:2.11-linux-ppc64le
linux/s390x=REGISTRY/agnhost:2.11-linux-s390x
linux/amd64=REGISTRY/agnhost:2.12-linux-amd64
linux/arm=REGISTRY/agnhost:2.12-linux-arm
linux/arm64=REGISTRY/agnhost:2.12-linux-arm64
linux/ppc64le=REGISTRY/agnhost:2.12-linux-ppc64le
linux/s390x=REGISTRY/agnhost:2.12-linux-s390x