Skip to content

Commit 45f0ac4

Browse files
authored
Don't reinstall librdkafka and confluent_kafka on e2e tests (#17376)
The Agent now includes librdkafka and other dependencies as part of the confluent_kafka package.
1 parent 26b7d26 commit 45f0ac4

File tree

3 files changed

+0
-59
lines changed

3 files changed

+0
-59
lines changed

kafka_consumer/hatch.toml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,6 @@ post-install-commands = [
1111
[envs.default.env-vars]
1212
ZK_VERSION = "3.6.4"
1313
AUTHENTICATION = "noauth"
14-
# The format is MMmmrr with MM = Major version, mm = minor version, rr = revision
15-
# This is needed to manually install the right version of librdkafka when we bump confluent-kafka
16-
# Thanks to this, the kerberos tests will be green even if the agent is still shipped with an older version
17-
# Bump them when you bump the confluent-kafka version
18-
LIBRDKAFKA_VERSION = "020300"
19-
CONFLUENT_KAFKA_VERSION = "2.3.0"
2014

2115
[[envs.default.matrix]]
2216
python = ["3.11"]
@@ -37,6 +31,3 @@ matrix.auth.env-vars = "AUTHENTICATION"
3731
[envs.latest.env-vars]
3832
KAFKA_VERSION = "latest"
3933
ZK_VERSION = "3.6.4"
40-
# Bump them when you bump the confluent-kafka version
41-
LIBRDKAFKA_VERSION = "020300"
42-
CONFLUENT_KAFKA_VERSION = "2.3.0"

kafka_consumer/tests/common.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,7 @@
3636
'docker_volumes': [
3737
f'{HERE}/docker/ssl/certificate:/tmp/certificate',
3838
f'{HERE}/docker/kerberos/kdc/krb5_agent.conf:/etc/krb5.conf',
39-
f'{HERE}/docker/scripts/install_librdkafka.bash:/tmp/install_librdkafka.bash',
4039
],
41-
'start_commands': [
42-
'bash /tmp/install_librdkafka.bash',
43-
],
44-
'env_vars': {
45-
'LIBRDKAFKA_VERSION': os.environ["LIBRDKAFKA_VERSION"],
46-
'CONFLUENT_KAFKA_VERSION': os.environ["CONFLUENT_KAFKA_VERSION"],
47-
},
4840
}
4941

5042
if AUTHENTICATION == "ssl":

kafka_consumer/tests/docker/scripts/install_librdkafka.bash

Lines changed: 0 additions & 42 deletions
This file was deleted.

0 commit comments

Comments
 (0)