Skip to content

Commit 29ab228

Browse files
committed
run docker arm64 tests in pod not vm
1 parent aeb780c commit 29ab228

File tree

3 files changed

+7
-16
lines changed

3 files changed

+7
-16
lines changed

hack/prow/boskos-cfg-arm64.json

Lines changed: 0 additions & 9 deletions
This file was deleted.

hack/prow/minikube_cross_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export MINIKUBE_BIN="out/minikube-${OS_ARCH}"
4040
export E2E_BIN="out/e2e-${OS_ARCH}"
4141
chmod +x "${MINIKUBE_BIN}" "${E2E_BIN}"
4242

43-
BUILT_VERSION=$("out/minikube-${OS_ARCH}" version)
43+
BUILT_VERSION=$("out/minikube-$(go env GOOS)-$(go env GOARCH)" version)
4444
echo ${BUILT_VERSION}
4545

4646
COMMIT=$(echo ${BUILT_VERSION} | grep 'commit:' | awk '{print $2}')

hack/prow/prow.mk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ integration-prow-docker-docker-linux-x86-64:
66
./hack/prow/minikube_cross_build.sh $(GO_VERSION) linux amd64
77
./hack/prow/util/integration_prow_wrapper.sh ./hack/prow/integration_docker_docker_linux_x86-64.sh
88

9+
.PHONY: integration-prow-docker-docker-linux-arm64
10+
integration-prow-docker-docker-linux-arm64:
11+
./hack/prow/minikube_cross_build.sh $(GO_VERSION) linux arm64
12+
./hack/prow/util/integration_prow_wrapper.sh ./hack/prow/integration_docker_docker_linux_arm64.sh
13+
14+
915
integration-prow-docker-containerd-linux-x86-64:
1016
./hack/prow/minikube_cross_build.sh $(GO_VERSION) linux amd64
1117
./hack/prow/util/integration_prow_wrapper.sh ./hack/prow/integration_docker_containerd_linux_x86-64.sh
@@ -17,12 +23,6 @@ integration-prow-docker-crio-linux-x86-64:
1723
# ----------------------------------------------------------------
1824
# Bellow Integration tests run in cloud VM using boskos
1925
# ----------------------------------------------------------------
20-
.PHONY: integration-prow-docker-docker-linux-arm64
21-
integration-prow-docker-docker-linux-arm64: setup-prow-gcp-ssh-keys build-mini-test
22-
./hack/prow/minikube_cross_build.sh $(GO_VERSION) linux arm64
23-
./out/minitest --deployer boskos --tester docker-linux-arm64-integration --config hack/prow/boskos-cfg-arm64.json
24-
25-
2626

2727
.PHONY: integration-prow-none-docker-linux-x86-64
2828
integration-prow-none-docker-linux-x86-64: setup-prow-gcp-ssh-keys build-mini-test

0 commit comments

Comments
 (0)