chore: Use the official Docker image in tests (#182)

Aiven-Open · May 31, 2024 · 209ea0f · 209ea0f
1 parent 2dd799a
commit 209ea0f
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 33 deletions.
diff --git a/container/compose.yml b/container/compose.yml
@@ -1,9 +1,7 @@
 name: kio
 services:
- # Adopted from
- # https://github.com/confluentinc/cp-all-in-one/tree/6.2.0-post/cp-all-in-one-kraft
  kafka:
- image: confluentinc/cp-kafka:7.3.1
+ image: apache/kafka:3.7.0
  hostname: broker
  container_name: broker
  ports:
@@ -28,8 +26,5 @@ services:
  KAFKA_BUFFER_MEMORY: 104857600
  KAFKA_MAX_REQUEST_SIZE: 104857600
  KAFKA_REPLICA_FETCH_MAX_BYTES: 104857600
- volumes:
- - ./update-run.sh:/tmp/update-run.sh
  tmpfs:
  - /tmp
- command: "bash -c 'if [ ! -f /tmp/update-run.sh ]; then echo \"ERROR: Did you forget the update-run.sh file that came with this compose.yml file?\" && exit 1 ; else /tmp/update-run.sh && /etc/confluent/docker/run ; fi'"
diff --git a/container/update-run.sh b/container/update-run.sh
diff --git a/tests/test_integration.py b/tests/test_integration.py
@@ -201,24 +201,24 @@ async def test_roundtrip_api_versions_v3() -> None:
  api_versions_v3_response.SupportedFeatureKey(
  name="metadata.version",
  min_version=i16(1),
- max_version=i16(7),
+ max_version=i16(19),
  ),
  ),
  finalized_features=(
  api_versions_v3_response.FinalizedFeatureKey(
  name="metadata.version",
- min_version_level=i16(7),
- max_version_level=i16(7),
+ min_version_level=i16(19),
+ max_version_level=i16(19),
  ),
  ),
  finalized_features_epoch=mock.ANY,
  api_keys=(
- ApiVersion(api_key=i16(0), min_version=i16(0), max_version=i16(9)),
- ApiVersion(api_key=i16(1), min_version=i16(0), max_version=i16(13)),
- ApiVersion(api_key=i16(2), min_version=i16(0), max_version=i16(7)),
+ ApiVersion(api_key=i16(0), min_version=i16(0), max_version=i16(10)),
+ ApiVersion(api_key=i16(1), min_version=i16(0), max_version=i16(16)),
+ ApiVersion(api_key=i16(2), min_version=i16(0), max_version=i16(8)),
  ApiVersion(api_key=i16(3), min_version=i16(0), max_version=i16(12)),
- ApiVersion(api_key=i16(8), min_version=i16(0), max_version=i16(8)),
- ApiVersion(api_key=i16(9), min_version=i16(0), max_version=i16(8)),
+ ApiVersion(api_key=i16(8), min_version=i16(0), max_version=i16(9)),
+ ApiVersion(api_key=i16(9), min_version=i16(0), max_version=i16(9)),
  ApiVersion(api_key=i16(10), min_version=i16(0), max_version=i16(4)),
  ApiVersion(api_key=i16(11), min_version=i16(0), max_version=i16(9)),
  ApiVersion(api_key=i16(12), min_version=i16(0), max_version=i16(4)),
@@ -233,7 +233,7 @@ async def test_roundtrip_api_versions_v3() -> None:
  ApiVersion(api_key=i16(21), min_version=i16(0), max_version=i16(2)),
  ApiVersion(api_key=i16(22), min_version=i16(0), max_version=i16(4)),
  ApiVersion(api_key=i16(23), min_version=i16(0), max_version=i16(4)),
- ApiVersion(api_key=i16(24), min_version=i16(0), max_version=i16(3)),
+ ApiVersion(api_key=i16(24), min_version=i16(0), max_version=i16(4)),
  ApiVersion(api_key=i16(25), min_version=i16(0), max_version=i16(3)),
  ApiVersion(api_key=i16(26), min_version=i16(0), max_version=i16(3)),
  ApiVersion(api_key=i16(27), min_version=i16(0), max_version=i16(1)),
@@ -247,6 +247,10 @@ async def test_roundtrip_api_versions_v3() -> None:
  ApiVersion(api_key=i16(35), min_version=i16(0), max_version=i16(4)),
  ApiVersion(api_key=i16(36), min_version=i16(0), max_version=i16(2)),
  ApiVersion(api_key=i16(37), min_version=i16(0), max_version=i16(3)),
+ ApiVersion(api_key=i16(38), min_version=i16(0), max_version=i16(3)),
+ ApiVersion(api_key=i16(39), min_version=i16(0), max_version=i16(2)),
+ ApiVersion(api_key=i16(40), min_version=i16(0), max_version=i16(2)),
+ ApiVersion(api_key=i16(41), min_version=i16(0), max_version=i16(3)),
  ApiVersion(api_key=i16(42), min_version=i16(0), max_version=i16(2)),
  ApiVersion(api_key=i16(43), min_version=i16(0), max_version=i16(2)),
  ApiVersion(api_key=i16(44), min_version=i16(0), max_version=i16(1)),
@@ -255,14 +259,19 @@ async def test_roundtrip_api_versions_v3() -> None:
  ApiVersion(api_key=i16(47), min_version=i16(0), max_version=i16(0)),
  ApiVersion(api_key=i16(48), min_version=i16(0), max_version=i16(1)),
  ApiVersion(api_key=i16(49), min_version=i16(0), max_version=i16(1)),
+ ApiVersion(api_key=i16(50), min_version=i16(0), max_version=i16(0)),
+ ApiVersion(api_key=i16(51), min_version=i16(0), max_version=i16(0)),
  ApiVersion(api_key=i16(55), min_version=i16(0), max_version=i16(1)),
  ApiVersion(api_key=i16(57), min_version=i16(0), max_version=i16(1)),
- ApiVersion(api_key=i16(60), min_version=i16(0), max_version=i16(0)),
+ ApiVersion(api_key=i16(60), min_version=i16(0), max_version=i16(1)),
  ApiVersion(api_key=i16(61), min_version=i16(0), max_version=i16(0)),
  ApiVersion(api_key=i16(64), min_version=i16(0), max_version=i16(0)),
  ApiVersion(api_key=i16(65), min_version=i16(0), max_version=i16(0)),
  ApiVersion(api_key=i16(66), min_version=i16(0), max_version=i16(0)),
+ ApiVersion(api_key=i16(68), min_version=i16(0), max_version=i16(0)),
+ ApiVersion(api_key=i16(74), min_version=i16(0), max_version=i16(0)),
  ),
+ zk_migration_ready=False,
  )
 
 
@@ -276,12 +285,12 @@ async def test_roundtrip_api_versions_v2() -> None:
  error_code=ErrorCode.none,
  throttle_time=timedelta_zero,
  api_keys=(
- ApiVersion(api_key=i16(0), min_version=i16(0), max_version=i16(9)),
- ApiVersion(api_key=i16(1), min_version=i16(0), max_version=i16(13)),
- ApiVersion(api_key=i16(2), min_version=i16(0), max_version=i16(7)),
+ ApiVersion(api_key=i16(0), min_version=i16(0), max_version=i16(10)),
+ ApiVersion(api_key=i16(1), min_version=i16(0), max_version=i16(16)),
+ ApiVersion(api_key=i16(2), min_version=i16(0), max_version=i16(8)),
  ApiVersion(api_key=i16(3), min_version=i16(0), max_version=i16(12)),
- ApiVersion(api_key=i16(8), min_version=i16(0), max_version=i16(8)),
- ApiVersion(api_key=i16(9), min_version=i16(0), max_version=i16(8)),
+ ApiVersion(api_key=i16(8), min_version=i16(0), max_version=i16(9)),
+ ApiVersion(api_key=i16(9), min_version=i16(0), max_version=i16(9)),
  ApiVersion(api_key=i16(10), min_version=i16(0), max_version=i16(4)),
  ApiVersion(api_key=i16(11), min_version=i16(0), max_version=i16(9)),
  ApiVersion(api_key=i16(12), min_version=i16(0), max_version=i16(4)),
@@ -296,7 +305,7 @@ async def test_roundtrip_api_versions_v2() -> None:
  ApiVersion(api_key=i16(21), min_version=i16(0), max_version=i16(2)),
  ApiVersion(api_key=i16(22), min_version=i16(0), max_version=i16(4)),
  ApiVersion(api_key=i16(23), min_version=i16(0), max_version=i16(4)),
- ApiVersion(api_key=i16(24), min_version=i16(0), max_version=i16(3)),
+ ApiVersion(api_key=i16(24), min_version=i16(0), max_version=i16(4)),
  ApiVersion(api_key=i16(25), min_version=i16(0), max_version=i16(3)),
  ApiVersion(api_key=i16(26), min_version=i16(0), max_version=i16(3)),
  ApiVersion(api_key=i16(27), min_version=i16(0), max_version=i16(1)),
@@ -310,6 +319,10 @@ async def test_roundtrip_api_versions_v2() -> None:
  ApiVersion(api_key=i16(35), min_version=i16(0), max_version=i16(4)),
  ApiVersion(api_key=i16(36), min_version=i16(0), max_version=i16(2)),
  ApiVersion(api_key=i16(37), min_version=i16(0), max_version=i16(3)),
+ ApiVersion(api_key=i16(38), min_version=i16(0), max_version=i16(3)),
+ ApiVersion(api_key=i16(39), min_version=i16(0), max_version=i16(2)),
+ ApiVersion(api_key=i16(40), min_version=i16(0), max_version=i16(2)),
+ ApiVersion(api_key=i16(41), min_version=i16(0), max_version=i16(3)),
  ApiVersion(api_key=i16(42), min_version=i16(0), max_version=i16(2)),
  ApiVersion(api_key=i16(43), min_version=i16(0), max_version=i16(2)),
  ApiVersion(api_key=i16(44), min_version=i16(0), max_version=i16(1)),
@@ -318,13 +331,17 @@ async def test_roundtrip_api_versions_v2() -> None:
  ApiVersion(api_key=i16(47), min_version=i16(0), max_version=i16(0)),
  ApiVersion(api_key=i16(48), min_version=i16(0), max_version=i16(1)),
  ApiVersion(api_key=i16(49), min_version=i16(0), max_version=i16(1)),
+ ApiVersion(api_key=i16(50), min_version=i16(0), max_version=i16(0)),
+ ApiVersion(api_key=i16(51), min_version=i16(0), max_version=i16(0)),
  ApiVersion(api_key=i16(55), min_version=i16(0), max_version=i16(1)),
  ApiVersion(api_key=i16(57), min_version=i16(0), max_version=i16(1)),
- ApiVersion(api_key=i16(60), min_version=i16(0), max_version=i16(0)),
+ ApiVersion(api_key=i16(60), min_version=i16(0), max_version=i16(1)),
  ApiVersion(api_key=i16(61), min_version=i16(0), max_version=i16(0)),
  ApiVersion(api_key=i16(64), min_version=i16(0), max_version=i16(0)),
  ApiVersion(api_key=i16(65), min_version=i16(0), max_version=i16(0)),
  ApiVersion(api_key=i16(66), min_version=i16(0), max_version=i16(0)),
+ ApiVersion(api_key=i16(68), min_version=i16(0), max_version=i16(0)),
+ ApiVersion(api_key=i16(74), min_version=i16(0), max_version=i16(0)),
  ),
  )