Skip to content

Commit

Permalink
update kustomize and golangci-lint
Browse files Browse the repository at this point in the history
Signed-off-by: cpanato <ctadeu@gmail.com>
  • Loading branch information
cpanato committed Mar 4, 2024
1 parent a57a353 commit b10505d
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 61 deletions.
6 changes: 3 additions & 3 deletions Makefile
Expand Up @@ -71,7 +71,7 @@ ENVSUBST_VER := v1.4.2
ENVSUBST_BIN := envsubst
ENVSUBST := $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)

GOLANGCI_LINT_VER := v1.55.2
GOLANGCI_LINT_VER := v1.56.2
GOLANGCI_LINT_BIN := golangci-lint
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)

Expand Down Expand Up @@ -199,7 +199,7 @@ test-junit: $(SETUP_ENVTEST) $(GOTESTSUM) ## Run tests with verbose setting and
exit $$(cat $(ARTIFACTS)/junit.exitcode)

.PHONY: test-e2e
test-e2e: ## Run the end-to-end tests
test-e2e: $(KUSTOMIZE) ## Run the end-to-end tests
$(MAKE) test-e2e-run

LOCAL_GINKGO_ARGS ?=
Expand All @@ -214,7 +214,7 @@ test-e2e-local: ## Run e2e tests
CONFORMANCE_E2E_ARGS ?= -kubetest.config-file=$(KUBETEST_CONF_PATH)
CONFORMANCE_E2E_ARGS += $(E2E_ARGS)
.PHONY: test-conformance
test-conformance: ## Run conformance test on workload cluster.
test-conformance: $(KUSTOMIZE) ## Run conformance test on workload cluster.
$(MAKE) test-e2e-run GINKGO_FOCUS="Conformance Tests" E2E_ARGS='$(CONFORMANCE_E2E_ARGS)' GINKGO_ARGS='$(LOCAL_GINKGO_ARGS)'

## --------------------------------------
Expand Down
54 changes: 0 additions & 54 deletions hack/ensure-kustomize.sh

This file was deleted.

2 changes: 0 additions & 2 deletions scripts/ci-conformance.sh
Expand Up @@ -30,8 +30,6 @@ make --directory="${REPO_ROOT}" "${KUBECTL##*/}" "${KIND##*/}"

# shellcheck source=hack/ensure-go.sh
source "${REPO_ROOT}/hack/ensure-go.sh"
# shellcheck source=hack/ensure-kustomize.sh
source "${REPO_ROOT}/hack/ensure-kustomize.sh"

ARTIFACTS="${ARTIFACTS:-${PWD}/_artifacts}"
mkdir -p "${ARTIFACTS}/logs/"
Expand Down
2 changes: 0 additions & 2 deletions scripts/ci-e2e.sh
Expand Up @@ -30,8 +30,6 @@ make --directory="${REPO_ROOT}" "${KUBECTL##*/}" "${KIND##*/}"

# shellcheck source=hack/ensure-go.sh
source "${REPO_ROOT}/hack/ensure-go.sh"
# shellcheck source=hack/ensure-kustomize.sh
source "${REPO_ROOT}/hack/ensure-kustomize.sh"

# Configure e2e tests
export GINKGO_NODES=3
Expand Down

0 comments on commit b10505d

Please sign in to comment.