From f575f921ac75f48a9ab48bc64f48344dc84a15cd Mon Sep 17 00:00:00 2001 From: rameshiyer27 Date: Thu, 12 Oct 2023 15:11:02 +0100 Subject: Fix k8s csit test failures Issue-ID: POLICY-4853 Signed-off-by: rameshiyer27 Change-Id: If99cb19a60e65b720a60105d222ce321da7b01d3 --- csit/run-k8s-csit.sh | 6 ++---- csit/start-s3p-tests.sh | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'csit') diff --git a/csit/run-k8s-csit.sh b/csit/run-k8s-csit.sh index d383d1a1..248a494f 100755 --- a/csit/run-k8s-csit.sh +++ b/csit/run-k8s-csit.sh @@ -21,10 +21,8 @@ # This script spins up kubernetes cluster in Microk8s for deploying policy helm charts. # Runs CSITs in kubernetes. -if [ -z "${WORKSPACE}" ]; then - WORKSPACE=$(git rev-parse --show-toplevel) - export WORKSPACE -fi +WORKSPACE=$(git rev-parse --show-toplevel) +export WORKSPACE export GERRIT_BRANCH=$(awk -F= '$1 == "defaultbranch" { print $2 }' "${WORKSPACE}"/.gitreview) diff --git a/csit/start-s3p-tests.sh b/csit/start-s3p-tests.sh index 8fb571f4..1609e4bb 100755 --- a/csit/start-s3p-tests.sh +++ b/csit/start-s3p-tests.sh @@ -22,8 +22,8 @@ # Start Kubernetes function start_kubernetes() { - bash run-k8s-csit.sh install $3 - bash get-cluster-info.sh + bash run-k8s-csit.sh install + bash resources/scripts/get-cluster-info.sh } function install_jmeter() { -- cgit 1.2.3-korg