From 6538d7c21cfe94c0d89d2261b83baedc7f54c315 Mon Sep 17 00:00:00 2001 From: prafull01 Date: Fri, 1 Nov 2024 18:47:15 +0530 Subject: [PATCH] Fix the CI tests --- Makefile | 4 ++-- hack/BUILD.bazel | 2 +- hack/bin/BUILD.bazel | 4 +++- hack/bin/deps.bzl | 4 ++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 08ac814b4..184b279e1 100644 --- a/Makefile +++ b/Makefile @@ -59,7 +59,7 @@ test/pkg: # takes a bit of time. .PHONY: test/verify test/verify: - bazel test //hack/... + bazel test --test_output=all //hack/... .PHONY: test/lint test/lint: @@ -94,7 +94,7 @@ test/e2e-short: test/e2e/testrunner-k3d-%: PACKAGE=$* test/e2e/testrunner-k3d-%: bazel run //hack/k8s:k8s -- -type k3d - bazel test --stamp //e2e/$(PACKAGE)/... --test_arg=-test.v --test_arg=-test.parallel=4 --test_arg=parallel=true + bazel test --test_output=all --stamp //e2e/$(PACKAGE)/... --test_arg=-test.v --test_arg=-test.parallel=4 --test_arg=parallel=true # Use this target to run e2e tests using a k3d k8s cluster. # This target uses k3d to start a k8s cluster and runs the e2e tests diff --git a/hack/BUILD.bazel b/hack/BUILD.bazel index 940f08b30..e6000eb31 100644 --- a/hack/BUILD.bazel +++ b/hack/BUILD.bazel @@ -106,7 +106,7 @@ sh_test( args = [ "run", "--config .golangci.yaml", - "--timeout 5m", + "--timeout 10m", ], data = ["@//:all-srcs"], env = { diff --git a/hack/bin/BUILD.bazel b/hack/bin/BUILD.bazel index 9033aea90..494a5c98e 100644 --- a/hack/bin/BUILD.bazel +++ b/hack/bin/BUILD.bazel @@ -38,6 +38,8 @@ genrule( visibility = ["//visibility:public"], ) +# fetch preflight has only linux supported binary and only used for releasing the operator to openshift +# Hence, fetching same binary for all platforms to allow bazel sync on other platform. genrule( name = "fetch_preflight", srcs = select({ @@ -77,7 +79,7 @@ genrule( genrule( name = "io_kubernetes_kube-apiserver", srcs = select({ - ":m1": ["@kube-apiserver_linux_amd64//file"], + ":m1": ["@kube-apiserver_darwin_amd64//file"], ":darwin": ["@kube-apiserver_linux_amd64//file"], ":k8": ["@kube-apiserver_linux_amd64//file"], }), diff --git a/hack/bin/deps.bzl b/hack/bin/deps.bzl index ad2f14d6c..9544dcf14 100644 --- a/hack/bin/deps.bzl +++ b/hack/bin/deps.bzl @@ -128,8 +128,8 @@ def install_integration_test_dependencies(): http_file( name = "kube-apiserver_darwin_amd64", executable = 1, - sha256 = "a874d479f183f9e4c19a5c69b44955fabd2e250b467d2d9f0641ae91a82ddbea", - urls = ["https://storage.googleapis.com/cert-manager-testing-assets/kube-apiserver-1.17.3_darwin_amd64"], + sha256 = "b575b687097b4662b7eb2ea5453e4b381994ddf34b85ca4bb8e4f16c5f86bedb", + urls = ["https://storage.googleapis.com/cockroach-operator-testing-assets/kube-apiserver-1.24.2_darwin_arm64"], ) http_file(