From 286a69b53c25b2b947f55ac93f556897f3e773c2 Mon Sep 17 00:00:00 2001 From: Shinya Hayashi Date: Fri, 14 Jun 2024 04:19:19 +0000 Subject: [PATCH] hoge Signed-off-by: Shinya Hayashi --- .github/workflows/deploy-rook-ceph-on-two-k8s-clusters.yaml | 1 + .github/workflows/e2e.yaml | 1 + test/e2e/Makefile | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-rook-ceph-on-two-k8s-clusters.yaml b/.github/workflows/deploy-rook-ceph-on-two-k8s-clusters.yaml index e233f09e..82f6cd14 100644 --- a/.github/workflows/deploy-rook-ceph-on-two-k8s-clusters.yaml +++ b/.github/workflows/deploy-rook-ceph-on-two-k8s-clusters.yaml @@ -57,6 +57,7 @@ jobs: - run: |- make -C test/e2e setup ln -s $(pwd)/test/e2e/bin/kubectl-1.28.3 test/e2e/bin/kubectl + - run: make -C test/e2e image-build - run: |- make -C test/e2e launch-minikube PROFILE=profile1 make -C test/e2e launch-minikube PROFILE=profile2 diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index f9328040..9d684fd8 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -55,4 +55,5 @@ jobs: sudo modprobe -a kvm sudo modprobe -a kvm_amd - run: make -C test/e2e setup + - run: make -C test/e2e image-build - run: make -C test/e2e test diff --git a/test/e2e/Makefile b/test/e2e/Makefile index 94f2216f..12a14c4d 100644 --- a/test/e2e/Makefile +++ b/test/e2e/Makefile @@ -201,9 +201,12 @@ delete-rook-ceph: $(KUBECTL) delete -f testdata/persistentvolumes.yaml || : $(MAKE) delete-loop-dev +.PHONY: image-build +image-build: + $(MAKE) -C ../.. docker-build + .PHONY: setup-components setup-components: - $(MAKE) -C ../.. docker-build # We can't use `minikube image load` due to a minikube's problem. # ref. https://github.com/kubernetes/minikube/issues/17785 docker save controller:latest | $(SUDO) ctr -n k8s.io images import -