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 docker hub perf tests #87

Merged
merged 22 commits into from
Jan 23, 2025
Merged

Fix docker hub perf tests #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
bc8f0ae
fix docker hub issue for performance tests
franvila Jan 15, 2025
f399fed
removed wait to use podman compose
franvila Jan 15, 2025
446d50d
remove wait from 02 test
franvila Jan 15, 2025
c86fb22
remove wait from 02 test
franvila Jan 15, 2025
bb773fe
remove wait from 02 test
franvila Jan 15, 2025
724384f
remove wait from 02 test
franvila Jan 15, 2025
ace9792
remove wait from 02 test
franvila Jan 15, 2025
b060ea5
remove wait from 02 test
franvila Jan 16, 2025
c9f5424
Merge branch 'main' into fixDockerHubPerfTests
franvila Jan 16, 2025
5d0e467
Merge branch 'main' into fixDockerHubPerfTests
franvila Jan 21, 2025
7b0a3dc
set mirror gcr as default
franvila Jan 22, 2025
e4f00dc
Merge branch 'main' into fixDockerHubPerfTests
franvila Jan 22, 2025
41a66c2
fix record encryption filter
franvila Jan 22, 2025
0954ff4
added USER_DOCKER_MIRROR variable
franvila Jan 22, 2025
1ed5ba5
rename vault image printf
franvila Jan 22, 2025
7c5c02f
testing mirror
franvila Jan 23, 2025
feb786b
testing mirror
franvila Jan 23, 2025
5247ccf
testing mirror
franvila Jan 23, 2025
fc62c57
testing mirror
franvila Jan 23, 2025
5bef9d4
testing mirror
franvila Jan 23, 2025
df69bd7
testing mirror
franvila Jan 23, 2025
08e14ca
remiving docker registry from renovate
franvila Jan 23, 2025
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
4 changes: 2 additions & 2 deletions .github/renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
"kroxylicious-kms-provider-hashicorp-vault-test-support/src/main/java/io/kroxylicious/kms/provider/hashicorp/vault/VaultTestKmsFacade.java",
"kroxylicious-kms-provider-hashicorp-vault/src/test/java/io/kroxylicious/kms/provider/hashicorp/vault/TestVault.java",
"kroxylicious-systemtests/src/main/resources/helm_vault_overrides.yaml",
"performance-tests/docker-compose.yaml"
"performance-tests/perf-tests.sh"
],
"matchStrings": [
"DockerImageName\\.parse\\(\"(?<depName>hashicorp/vault):(?<currentValue>\\d+\\.\\d+.\\d+)\"\\)",
"image:.*(?<depName>hashicorp/vault):(?<currentValue>\\d+\\.\\d+.\\d+)",
"(?<depName>hashicorp/vault):(?<currentValue>\\d+\\.\\d+.\\d+)",
"tag:.*(?<currentValue>\\d+\\.\\d+.\\d+)"
],
"datasourceTemplate": "docker"
Expand Down
2 changes: 1 addition & 1 deletion performance-tests/04-record-encryption-filter/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ virtualClusters:
logFrames: false
filterDefinitions:
- name: encrypt
- type: RecordEncryption
type: RecordEncryption
config:
kms: VaultKmsService
kmsConfig:
Expand Down
2 changes: 1 addition & 1 deletion performance-tests/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
networks:
- perf_network
vault:
image: ${VAULT_IMAGE:-hashicorp/vault:1.18.3}
image: ${VAULT_IMAGE}
hostname: vault
container_name: vault
ports:
Expand Down
14 changes: 10 additions & 4 deletions performance-tests/perf-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,30 @@ NOCOLOR='\033[0m'

KROXYLICIOUS_CHECKOUT=${KROXYLICIOUS_CHECKOUT:-${PERF_TESTS_DIR}/..}

DOCKER_REGISTRY="docker.io"
if [ "${USE_DOCKER_MIRROR}" == "true" ]
then
DOCKER_REGISTRY="mirror.gcr.io"
fi

KAFKA_VERSION=${KAFKA_VERSION:-$(mvn -f "${KROXYLICIOUS_CHECKOUT}"/pom.xml org.apache.maven.plugins:maven-help-plugin:3.4.0:evaluate -Dexpression=kafka.version -q -DforceStdout -pl kroxylicious-systemtests)}
STRIMZI_VERSION=${STRIMZI_VERSION:-$(mvn -f "${KROXYLICIOUS_CHECKOUT}"/pom.xml org.apache.maven.plugins:maven-help-plugin:3.4.0:evaluate -Dexpression=strimzi.version -q -DforceStdout)}
KROXYLICIOUS_VERSION=${KROXYLICIOUS_VERSION:-$(mvn -f "${KROXYLICIOUS_CHECKOUT}"/pom.xml org.apache.maven.plugins:maven-help-plugin:3.4.0:evaluate -Dexpression=project.version -q -DforceStdout)}
KAFKA_TOOL_IMAGE=${KAFKA_TOOL_IMAGE:-quay.io/strimzi/kafka:${STRIMZI_VERSION}-kafka-${KAFKA_VERSION}}
KAFKA_IMAGE=${KAFKA_IMAGE:-"apache/kafka-native:${KAFKA_VERSION}"}
KAFKA_IMAGE=${KAFKA_IMAGE:-"${DOCKER_REGISTRY}/apache/kafka-native:${KAFKA_VERSION}"}
KROXYLICIOUS_IMAGE=${KROXYLICIOUS_IMAGE:-"quay.io/kroxylicious/kroxylicious:${KROXYLICIOUS_VERSION}"}
VAULT_IMAGE=${VAULT_IMAGE:-"${DOCKER_REGISTRY}/hashicorp/vault:1.18.3"}
PERF_NETWORK=performance-tests_perf_network
CONTAINER_ENGINE=${CONTAINER_ENGINE:-"docker"}
LOADER_DIR=${LOADER_DIR:-"/tmp/asprof-extracted"}
export KAFKA_VERSION KAFKA_TOOL_IMAGE KAFKA_IMAGE KROXYLICIOUS_IMAGE CONTAINER_ENGINE


export KAFKA_VERSION KAFKA_TOOL_IMAGE KAFKA_IMAGE KROXYLICIOUS_IMAGE VAULT_IMAGE CONTAINER_ENGINE

printf "KAFKA_VERSION: ${KAFKA_VERSION}\n"
printf "STRIMZI_VERSION: ${STRIMZI_VERSION}\n"
printf "KROXYLICIOUS_VERSION: ${KROXYLICIOUS_VERSION}\n"
printf "KAFKA_IMAGE: ${KAFKA_IMAGE}\n"
printf "KROXYLICIOUS_IMAGE: ${KROXYLICIOUS_IMAGE}\n"
printf "VAULT_IMAGE: ${VAULT_IMAGE}\n"


runDockerCompose () {
Expand Down
Loading