Skip to content

Commit 3a7b027

Browse files
committed
chore: fix tests
1 parent bf908ee commit 3a7b027

File tree

2 files changed

+41
-11
lines changed

2 files changed

+41
-11
lines changed

.github/workflows/router-ci.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,22 @@ jobs:
150150
password: ${{secrets.DOCKER_PASSWORD}}
151151
ports:
152152
- 6379:6379
153+
kafka:
154+
image: bitnami/kafka:3.7.0
155+
env:
156+
KAFKA_ENABLE_KRAFT: yes
157+
KAFKA_CFG_PROCESS_ROLES: controller,broker
158+
KAFKA_CFG_CONTROLLER_LISTENER_NAMES: CONTROLLER
159+
KAFKA_CFG_LISTENERS: PLAINTEXT://:9092,CONTROLLER://:9093
160+
KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
161+
KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: 1@localhost:9093
162+
KAFKA_CFG_TRANSACTION_PARTITION_VERIFICATION_ENABLE: false
163+
KAFKA_CFG_ADVERTISED_LISTENERS: PLAINTEXT://localhost:9092
164+
KAFKA_CFG_NODE_ID: 1
165+
ALLOW_PLAINTEXT_LISTENER: yes
166+
KAFKA_KRAFT_CLUSTER_ID: XkpGZQ27R3eTl3OdTm2LYA # 16 byte base64-encoded UUID
167+
ports:
168+
- '9092:9092'
153169
steps:
154170
- uses: actions/checkout@v4
155171
- uses: ./.github/actions/go

router-tests/testenv/testenv.go

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -364,22 +364,36 @@ func createTestEnv(t testing.TB, cfg *Config) (*Environment, error) {
364364
}
365365

366366
if cfg.EnableKafka {
367-
kafkaStarted.Add(1)
368-
go func() {
369-
defer kafkaStarted.Done()
367+
if os.Getenv("CI") == "true" {
368+
cfg.KafkaSeeds = []string{"localhost:9092"}
370369

371-
var kafkaSetupErr error
372-
kafkaSetup, kafkaSetupErr = setupKafkaServer(t)
373-
if kafkaSetupErr != nil || kafkaSetup == nil {
374-
t.Fatalf("could not setup kafka: %s", kafkaSetupErr.Error())
375-
return
370+
client, err := kgo.NewClient(
371+
kgo.SeedBrokers(cfg.KafkaSeeds...),
372+
)
373+
if err != nil {
374+
return nil, err
376375
}
377376

378-
kafkaClient = kafkaSetup.Client
377+
kafkaClient = client
379378
kafkaAdminClient = kadm.NewClient(kafkaClient)
379+
} else {
380+
kafkaStarted.Add(1)
381+
go func() {
382+
defer kafkaStarted.Done()
383+
384+
var kafkaSetupErr error
385+
kafkaSetup, kafkaSetupErr = setupKafkaServer(t)
386+
if kafkaSetupErr != nil || kafkaSetup == nil {
387+
t.Fatalf("could not setup kafka: %s", kafkaSetupErr.Error())
388+
return
389+
}
380390

381-
cfg.KafkaSeeds = kafkaSetup.Brokers
382-
}()
391+
kafkaClient = kafkaSetup.Client
392+
kafkaAdminClient = kadm.NewClient(kafkaClient)
393+
394+
cfg.KafkaSeeds = kafkaSetup.Brokers
395+
}()
396+
}
383397
}
384398

385399
if cfg.EnableNats {

0 commit comments

Comments
 (0)