Merge pull request #68 from vinli-cn/longhaulbug

Fix few bugs in Longhaul test scripts
kubernetes-sigs · Nov 10, 2022 · e71d848 · e71d848
2 parents 636a84b + 88b97d5
commit e71d848
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/test/long-haul/external-e2e.sh b/test/long-haul/external-e2e.sh
@@ -19,7 +19,7 @@ curl -Lo ${REPO_ROOT_PATH}/go1.19.2.linux-amd64.tar.gz https://go.dev/dl/go1.19.
 tar -zxf go1.19.2.linux-amd64.tar.gz -C ${REPO_ROOT_PATH}/
 export GOBIN=${REPO_ROOT_PATH}/go/bin
 export PATH=${GOBIN}:${PATH}
-go install github.com/onsi/ginkgo/v2/ginkgo@1.2.0
+go install github.com/onsi/ginkgo/v2/ginkgo@1.16.5
 
 echo "Downloading latest kubectl"
 curl -Lo ${REPO_ROOT_PATH}/kubectl "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"

diff --git a/test/long-haul/start-long-haul.sh b/test/long-haul/start-long-haul.sh
@@ -23,6 +23,7 @@ REPO_ROOT_PATH=${REPO_ROOT_PATH:-$(git rev-parse --show-toplevel)}
 pushd "$REPO_ROOT_PATH/test/long-haul/"
 source ./utils.sh
 
+export REPO_ROOT_PATH=$REPO_ROOT_PATH
 export ClusterName="${aks_cluster_name}"
 export ResourceGroup="${aks_resource_group}"
 export PoolName="${aks_pool_name}"

diff --git a/test/long-haul/update-test.sh b/test/long-haul/update-test.sh
@@ -59,7 +59,7 @@ if [[ "$kubernetesUpgrades" != "null" ]]; then
 	# Skip preview AKS version and get the latest one
 	latestKubernetesVersion=$(echo "$kubernetesUpgrades" | jq -r '.[] | select (.isPreview == null) | .kubernetesVersion' | tail -n 1)
 
-	if [[ ! -z "$kubernetesUpgrades" ]]; then
+	if [[ ! -z "$latestKubernetesVersion" ]]; then
 		print_logs_info "Upgrading Kubernetes control-plane to version $latestKubernetesVersion"
 		az aks upgrade --resource-group $ResourceGroup --name $ClusterName --yes --kubernetes-version $latestKubernetesVersion
 	fi

diff --git a/test/long-haul/utils.sh b/test/long-haul/utils.sh
@@ -4,6 +4,7 @@ set -o nounset
 
 REPO_ROOT_PATH=${REPO_ROOT_PATH:-$(git rev-parse --show-toplevel)}
 
+export REPO_ROOT_PATH=$REPO_ROOT_PATH
 export NodePodNameKeyword="csi-azurelustre-node"
 export SampleWorkloadKeyword="azurelustre-longhaulsample-deployment"