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

Merge pull request #95032 from claudiubelu/test-images/multiarch

Browse Source 
test images: Removes -p yes flag from qemu-user-static script call
This commit is contained in:
Kubernetes Prow Robot 2020-11-06 12:24:29 -08:00 committed by GitHub
commit 58f82efe70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/images/Makefile
View File

@ -15,7 +15,7 @@
REGISTRY ?= gcr.io/kubernetes-e2e-test-images REGISTRY ?= gcr.io/kubernetes-e2e-test-images
GOARM ?= 7 GOARM ?= 7
DOCKER_CERT_BASE_PATH ?= DOCKER_CERT_BASE_PATH ?=
QEMUVERSION=v2.9.1 QEMUVERSION=v5.1.0-2
GOLANG_VERSION=1.15.2 GOLANG_VERSION=1.15.2
export export

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

@ -149,7 +149,7 @@ build() {
if [[ $(id -u) != 0 ]]; then if [[ $(id -u) != 0 ]]; then
sudo=sudo sudo=sudo
fi fi
${sudo} "${KUBE_ROOT}/third_party/multiarch/qemu-user-static/register/register.sh" --reset -p yes ${sudo} "${KUBE_ROOT}/third_party/multiarch/qemu-user-static/register/register.sh" --reset
curl -sSL https://github.com/multiarch/qemu-user-static/releases/download/"${QEMUVERSION}"/x86_64_qemu-"${QEMUARCHS[$arch]}"-static.tar.gz | tar -xz -C "${temp_dir}" curl -sSL https://github.com/multiarch/qemu-user-static/releases/download/"${QEMUVERSION}"/x86_64_qemu-"${QEMUARCHS[$arch]}"-static.tar.gz | tar -xz -C "${temp_dir}"
# Ensure we don't get surprised by umask settings # Ensure we don't get surprised by umask settings
chmod 0755 "${temp_dir}/qemu-${QEMUARCHS[$arch]}-static" chmod 0755 "${temp_dir}/qemu-${QEMUARCHS[$arch]}-static"

3
third_party/multiarch/qemu-user-static/README.kubernetes vendored
View File

@ -1 +1,2 @@
Files copied from https://github.com/multiarch/qemu-user-static at commit 22b0013668d2aed4a2cfd21650e85c664b1f21c6. qemu-binfmt-confg.sh comes from https://github.com/qemu/qemu/blob/7c81570d932268a9626457a662f1c5046ebc455e/scripts/qemu-binfmt-conf.sh
register.sh comes from https://github.com/multiarch/qemu-user-static/blob/9898439ca975c9c4c0db2bdc4b3707d382559d09/containers/latest/register.sh