From b2a5441871058a91d656c32aa124eafc22f2d80d Mon Sep 17 00:00:00 2001 From: Satoru Takeuchi Date: Wed, 28 Feb 2024 07:59:33 +0000 Subject: [PATCH] update Signed-off-by: Satoru Takeuchi --- .github/workflows/e2e.yaml | 4 ++-- e2e/Makefile | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 1a9a8c18..e1bb2378 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -29,7 +29,7 @@ jobs: - run: sudo apt purge -y $(dpkg-query -W | grep nginx | awk '{print $1}') - run: sudo apt purge -y aria2 ansible azure-cli shellcheck rpm xorriso zsync esl-erlang firefox gfortran-8 gfortran-9 google-chrome-stable google-cloud-sdk - run: sudo apt purge -y imagemagick libmagickcore-dev libmagickwand-dev libmagic-dev ant ant-optional kubectl mercurial apt-transport-https - - run: sudo apt purge -y mono-complete unixodbc-dev yarn chrpath libxft-dev libfreetype6-dev libfontconfig1 libfontconfig1-dev + - run: sudo apt purge -y mono-complete unixodbc-dev yarn chrpath libxft-dev libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev - run: sudo apt purge -y snmp pollinate libpq-dev postgresql-client powershell ruby-full sphinxsearch subversion mongodb-org azure-cli microsoft-edge-stable - run: sudo apt purge -y $(dpkg-query -W | grep dotnet | awk '{print $1}') - run: sudo apt autoremove -y >/dev/null 2>&1 @@ -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 + - run: make -C e2e test-upstream-rook DOCKER_SAVE_PATH=/mnt diff --git a/e2e/Makefile b/e2e/Makefile index ccafad43..b26e4924 100644 --- a/e2e/Makefile +++ b/e2e/Makefile @@ -204,7 +204,9 @@ 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 - minikube image load controller:latest + # 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 - $(MAKE) -C .. install $(MAKE) -C .. deploy