Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix test script & update kubebuilder tools to 1.24.x #736

Merged
merged 1 commit into from
Jun 29, 2022
Merged

Fix test script & update kubebuilder tools to 1.24.x #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 0 additions & 21 deletions scripts/ci-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion scripts/fetch_ext_bins.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down