From fdd69106a34cc3bc06c3ee51cbafead45feac102 Mon Sep 17 00:00:00 2001 From: Hao Fan Date: Wed, 4 Sep 2024 01:20:35 +0800 Subject: [PATCH 1/2] modify IMAGE_TAG to fix the version parsing issue --- test/run-e2e-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/run-e2e-tests.sh b/test/run-e2e-tests.sh index 8bcd948b9..a5a98c878 100755 --- a/test/run-e2e-tests.sh +++ b/test/run-e2e-tests.sh @@ -23,7 +23,7 @@ SKIP_INSTALL=${SKIP_INSTALL:-} KIND_E2E=${KIND_E2E:-} # Build a descheduler image -IMAGE_TAG=$(git describe --tags --match v0*) +IMAGE_TAG=v$(date +%Y%m%d)-$(git describe --tags) BASEDIR=$(dirname "$0") VERSION="${IMAGE_TAG}" make -C ${BASEDIR}/.. image From ab6a3ca2d65dd55a6e910f6b2977d9b8d1170297 Mon Sep 17 00:00:00 2001 From: Hao Fan Date: Wed, 4 Sep 2024 01:22:16 +0800 Subject: [PATCH 2/2] avoid e2e test timeout --- test/run-e2e-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/run-e2e-tests.sh b/test/run-e2e-tests.sh index a5a98c878..6856df2f3 100755 --- a/test/run-e2e-tests.sh +++ b/test/run-e2e-tests.sh @@ -54,4 +54,4 @@ fi kubectl apply -f kubernetes/base/rbac.yaml PRJ_PREFIX="sigs.k8s.io/descheduler" -go test ${PRJ_PREFIX}/test/e2e/ -v +go test ${PRJ_PREFIX}/test/e2e/ -v -timeout 0