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

Update gatling version #118

Merged
merged 6 commits into from
Jun 3, 2024
Merged

Update gatling version #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
554404e
update gatling version
kane8n May 24, 2024
541193b
fix setup-envtest to latest
kane8n May 24, 2024
0f65d92
fix jdk image & gatling zip file path
kane8n May 24, 2024
0504073
fix make test
kane8n May 27, 2024
824e2c5
gatling version -> 3.10.5 openjdk -> 21-jdk-slim-bullseye
kane8n May 27, 2024
4738acf
fix test
kane8n May 27, 2024
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
12 changes: 7 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ VERSION := latest
CRD_OPTIONS ?= "crd:trivialVersions=true,preserveUnknownFields=false"
KIND_CLUSTER_NAME ?= "gatling-cluster"
K8S_NODE_IMAGE ?= v1.21.10
ENVTEST_K8S_VERSION ?= 1.30.0

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
ifeq (,$(shell go env GOBIN))
Expand All @@ -25,7 +26,6 @@ endif
SHELL = /usr/bin/env bash -o pipefail
.SHELLFLAGS = -ec

ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
KIND_CLUSTER_CONFIG_DIR=$(shell pwd)/config/kind
KUBECONFIG_BACKUP_DIR=$(shell pwd)/.kube

Expand Down Expand Up @@ -81,10 +81,8 @@ fmt: ## Run go fmt against code.
vet: ## Run go vet against code.
go vet ./...

test: manifests generate fmt vet ## Run tests.
mkdir -p ${ENVTEST_ASSETS_DIR}
test -f ${ENVTEST_ASSETS_DIR}/setup-envtest.sh || curl -sSLo ${ENVTEST_ASSETS_DIR}/setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/v0.8.3/hack/setup-envtest.sh
source ${ENVTEST_ASSETS_DIR}/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR); setup_envtest_env $(ENVTEST_ASSETS_DIR); go test ./... -coverprofile cover.out
test: manifests generate fmt vet setup-envtest ## Run tests.
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use -p path $(ENVTEST_K8S_VERSION))" go test ./... -coverprofile cover.out

##@ Build

Expand Down Expand Up @@ -148,6 +146,10 @@ CRD_REF_DOCS = $(shell pwd)/bin/crd-ref-docs
crd-ref-docs: ## Download crd-ref-docs locally if necessary.
$(call go-install-tool,$(CRD_REF_DOCS),github.com/elastic/crd-ref-docs@master)

ENVTEST = $(shell pwd)/bin/setup-envtest
setup-envtest: ## Download setup-envtest locally if necessary.
$(call go-install-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)

# go-install-tool will 'go get' any package $2 and install it to $1.
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
define go-install-tool
Expand Down
4 changes: 2 additions & 2 deletions gatling/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
#
# Gatling is a highly capable load testing tool.

FROM openjdk:17-jdk-slim-bullseye
FROM openjdk:21-jdk-slim-bullseye

# working directory for gatling
WORKDIR /opt

# gating version
ENV GATLING_VERSION 3.9.5
ENV GATLING_VERSION 3.10.5

# create directory for gatling install
RUN mkdir -p gatling
Expand Down
Loading