From 1d5e27ea1638af000f811161ddb9e7105509585d Mon Sep 17 00:00:00 2001 From: Abhinandan Purkait Date: Wed, 22 Nov 2023 08:36:33 +0000 Subject: [PATCH] fix: shellcheck review Signed-off-by: Abhinandan Purkait --- ci/ci-test.sh | 3 +-- tests/e2e/Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ci/ci-test.sh b/ci/ci-test.sh index c9ef6e4b8..60ce37fe3 100755 --- a/ci/ci-test.sh +++ b/ci/ci-test.sh @@ -57,9 +57,8 @@ kubectl wait --for=condition=Ready --timeout=300s pods/openebs-cstor-csi-control # Run e2e tests for csi volumes cd ./tests/e2e -make e2e-test -if [ $? -ne 0 ]; then +if ! make e2e-test; then echo "******************** CSI Controller logs***************************** " dumpCSIControllerLogs 1000 diff --git a/tests/e2e/Makefile b/tests/e2e/Makefile index 5c3be3af3..40183f5eb 100644 --- a/tests/e2e/Makefile +++ b/tests/e2e/Makefile @@ -19,11 +19,11 @@ KUBECTL=/usr/local/bin/kubectl # If you want to change the Kubernetes version for e2e test, specify this variable from command line. -# e.g. $ make TEST_KUBERNETES_VERSION=1.17 test -TEST_KUBERNETES_VERSION=1.17 +# e.g. $ make TEST_KUBERNETES_VERSION=1.25.16 test +TEST_KUBERNETES_VERSION=1.25.16 -ifeq ($(TEST_KUBERNETES_VERSION),1.17) -KUBERNETES_VERSION=1.17.2 +ifeq ($(TEST_KUBERNETES_VERSION),1.25.16) +KUBERNETES_VERSION=1.25.16.2 endif