From f1a90b557eccdcb2b1ea505d4e45bcaa1685e47f Mon Sep 17 00:00:00 2001
From: Prajyot Parab <prajyot.parab2@ibm.com>
Date: Wed, 29 Jun 2022 20:24:05 +0530
Subject: [PATCH] Fix test script & update kubebuilder tools to 1.24.x (#736)

Signed-off-by: Prajyot-Parab <prajyot.parab2@ibm.com>
---
 Makefile                  |  2 +-
 scripts/ci-test.sh        | 21 ---------------------
 scripts/fetch_ext_bins.sh |  2 +-
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile
index dabf0d8ae..aa8c4c493 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ ARCH ?= amd64
 ALL_ARCH ?= amd64 ppc64le
 PULL_POLICY ?= Always
 
-KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.23.3
+KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.24.1
 
 # main controller
 CORE_IMAGE_NAME ?= cluster-api-ibmcloud-controller
diff --git a/scripts/ci-test.sh b/scripts/ci-test.sh
index 7bb50b48e..8fde415a6 100755
--- a/scripts/ci-test.sh
+++ b/scripts/ci-test.sh
@@ -22,29 +22,8 @@ REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 # shellcheck source=../hack/ensure-go.sh
 source "${REPO_ROOT}/hack/ensure-go.sh"
 
-# Directory to store JUnit XML test report.
-JUNIT_REPORT_DIR=${JUNIT_REPORT_DIR:-}
-
-# If JUNIT_REPORT_DIR is unset, and ARTIFACTS is set, then have them match.
-if [[ -z "${JUNIT_REPORT_DIR:-}" && -n "${ARTIFACTS:-}" ]]; then
-  JUNIT_REPORT_DIR="${ARTIFACTS}"
-fi
-
-#Add Junit test reports to ARTIFACTS directory.
-function addJunitFiles(){
-  declare -a junitFileList
-  readarray -t junitFileList <<< "$(find "${REPO_ROOT}" -name 'junit-*.xml')"
-
-  for i in "${junitFileList[@]}"
-  do 
-    mv "${i}" "${ARTIFACTS}" 
-  done
-}
-
 cd "${REPO_ROOT}" && \
 	source ./scripts/fetch_ext_bins.sh && \
 	fetch_tools && \
 	setup_envs && \
 	make generate lint test
-
-addJunitFiles
diff --git a/scripts/fetch_ext_bins.sh b/scripts/fetch_ext_bins.sh
index 30e72bdd0..d58c055a8 100755
--- a/scripts/fetch_ext_bins.sh
+++ b/scripts/fetch_ext_bins.sh
@@ -26,7 +26,7 @@ if [[ -n "${TRACE}" ]]; then
   set -x
 fi
 
-k8s_version=1.16.4
+k8s_version=1.24.1
 goarch=amd64
 goos="unknown"