Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
Signed-off-by: Satoru Takeuchi <satoru.takeuchi@gmail.com>
  • Loading branch information
satoru-takeuchi committed Feb 28, 2024
1 parent d920c4d commit 55959ee
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ jobs:
- run: df -h; lsblk
- run: make -C e2e setup-minikube-upstream-rook
- run: df -h; lsblk
- run: make -C e2e test-upstream-rook DOCKER_SAVE_PATH=/mnt
- run: make -C e2e test-upstream-rook
7 changes: 1 addition & 6 deletions e2e/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
include ../versions.mk

DOCKER_SAVE_PATH ?= .
BINDIR := $(shell pwd)/bin
TMPDIR := $(shell pwd)/tmp
CURL := curl -sSLf
Expand Down Expand Up @@ -91,7 +90,6 @@ test:

.PHONY: clean
clean:
rm -f controller-container.tar
$(MAKE) delete-rook-ceph
$(MAKE) delete-minikube

Expand Down Expand Up @@ -206,10 +204,7 @@ common/setup-components:
$(KUBECTL) apply -f https://github.com/cert-manager/cert-manager/releases/download/$(CERT_MANAGER_VERSION)/cert-manager.yaml
$(MAKE) -C .. docker-build
df -h
echo $(DOCKER_SAVE_PATH)/controller-container.tar
docker save controller:latest | $(SUDO) ctr -n k8s.io images import -
ls -l $(DOCKER_SAVE_PATH)/controller-container.tar
ls -hl $(DOCKER_SAVE_PATH)/controller-container.tar
minikube image load controller:latest

$(MAKE) -C .. install
$(MAKE) -C .. deploy
Expand Down

0 comments on commit 55959ee

Please sign in to comment.