hoge

Signed-off-by: Shinya Hayashi <shinya-hayashi@cybozu.co.jp>
cybozu-go · Jun 14, 2024 · 286a69b · 286a69b
1 parent 6bb882d
commit 286a69b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 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
@@ -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
@@ -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
@@ -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 -