Skip to content

added versioning and archs for test clients #106

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

Merged
franvila merged 1 commit into from
May 22, 2025
+17 −1
Merged

added versioning and archs for test clients #106

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
8 changes: 8 additions & 0 deletions .github/renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@
],
"datasourceTemplate": "docker"
},
{
"customType": "regex",
"fileMatch": ["kroxylicious-systemtests/src/main/java/io/kroxylicious/systemtests/Environment.java"],
"matchStrings": [
"(?<depName>quay.io/strimzi-test-clients/test-clients):(?<currentValue>\\d+\\.\\d+\\.\\d+)-kafka.*"
],
"datasourceTemplate": "docker"
},
{
"customType": "regex",
"fileMatch": [".github/workflows/maven.yaml",
Expand Down
5 changes: 4 additions & 1 deletion kroxylicious-systemtests/src/main/java/io/kroxylicious/systemtests/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,10 @@ private Constants() {
/**
* Test clients image url
*/
public static final String TEST_CLIENTS_IMAGE = "quay.io/strimzi-test-clients/test-clients:latest-kafka-" + Environment.KAFKA_VERSION;
public static final String TEST_CLIENTS_IMAGE = Environment.TEST_CLIENTS_IMAGE_BASE
+ ((Environment.TEST_CLIENTS_IMAGE_BASE.endsWith("-")) ? "" : "-")
+ Environment.KAFKA_VERSION
+ (Environment.ARCHITECTURE.isEmpty() ? "" : "-" + Environment.ARCHITECTURE);
public static final String KCAT_CLIENT_IMAGE = "quay.io/kroxylicious/kcat:1.7.1";
public static final String KAF_CLIENT_IMAGE = "quay.io/kroxylicious/kaf:v0.2.7";

Expand Down
5 changes: 5 additions & 0 deletions kroxylicious-systemtests/src/main/java/io/kroxylicious/systemtests/Environment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ private Environment() {
private static final String AWS_KROXYLICIOUS_ACCESS_KEY_ID_ENV = "AWS_KROXYLICIOUS_ACCESS_KEY_ID";
private static final String AWS_KROXYLICIOUS_SECRET_ACCESS_KEY_ENV = "AWS_KROXYLICIOUS_SECRET_ACCESS_KEY";
private static final String AWS_REGION_ENV = "AWS_REGION";
private static final String TEST_CLIENTS_IMAGE_BASE_ENV = "TEST_CLIENTS_IMAGE_BASE";
private static final String ARCHITECTURE_ENV = "ARCHITECTURE";

/**
* The kafka version default value
Expand Down Expand Up @@ -101,9 +103,12 @@ private Environment() {
public static final String AWS_KROXYLICIOUS_ACCESS_KEY_ID_DEFAULT = AWS_ACCESS_KEY_ID_DEFAULT;
private static final String AWS_KROXYLICIOUS_SECRET_ACCESS_KEY_DEFAULT = AWS_SECRET_ACCESS_KEY_DEFAULT;
public static final String AWS_REGION_DEFAULT = "us-east-2";
private static final String TEST_CLIENTS_IMAGE_BASE_DEFAULT = "quay.io/strimzi-test-clients/test-clients:0.11.0-kafka";

public static final String KAFKA_VERSION = ENVIRONMENT_VARIABLES.getOrDefault(KAFKA_VERSION_ENV, KAFKA_VERSION_DEFAULT);
public static final String KROXYLICIOUS_OPERATOR_VERSION = ENVIRONMENT_VARIABLES.getOrDefault(KROXYLICIOUS_OPERATOR_VERSION_ENV, KROXYLICIOUS_VERSION_DEFAULT);
public static final String TEST_CLIENTS_IMAGE_BASE = ENVIRONMENT_VARIABLES.getOrDefault(TEST_CLIENTS_IMAGE_BASE_ENV, TEST_CLIENTS_IMAGE_BASE_DEFAULT);
public static final String ARCHITECTURE = ENVIRONMENT_VARIABLES.getOrDefault(ARCHITECTURE_ENV, "");

/**
* SKIP_TEARDOWN env variable assignment.
Expand Down