Skip to content

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history
- Run Kafka 2.4 by default
- Pin SSL version 1.2
- Delete pausenet docker net because the docker image is oudated,
  github action runner does not like it.
- Delete .travis.yml
  • Loading branch information
zmstone committed Jun 14, 2024
1 parent 2e441ae commit f22a8d8
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 67 deletions.
40 changes: 0 additions & 40 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
KAFKA_VERSION ?= 2.4
export KAFKA_VERSION ?= 2.4
all: compile

rebar ?= $(shell which rebar3)
Expand Down
28 changes: 3 additions & 25 deletions scripts/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,17 @@
version: '2'

services:
pause:
image: "gcr.io/google_containers/pause-amd64:3.0"
networks:
- pausenet
ports:
- "2181:2181"
- "9092:9092"
- "9093:9093"
- "9094:9094"
- "9095:9095"
- "9192:9192"
- "9193:9193"
- "9194:9194"
- "9195:9195"
container_name: pause
zookeeper:
depends_on:
- pause
image: "zmstone/kafka:${KAFKA_VERSION}"
container_name: zookeeper
command: run zookeeper
network_mode: service:pause
network_mode: host
kafka_1:
depends_on:
- pause
- zookeeper
image: "zmstone/kafka:${KAFKA_VERSION}"
container_name: 'kafka-1'
network_mode: service:pause
network_mode: host
environment:
BROKER_ID: 0
PLAINTEXT_PORT: 9092
Expand All @@ -40,11 +22,10 @@ services:
ZOOKEEPER_CONNECT: "localhost:2181"
kafka_2:
depends_on:
- pause
- zookeeper
image: "zmstone/kafka:${KAFKA_VERSION}"
container_name: 'kafka-2'
network_mode: service:pause
network_mode: host
environment:
BROKER_ID: 1
PLAINTEXT_PORT: 9192
Expand All @@ -53,6 +34,3 @@ services:
SASL_PLAINTEXT_PORT: 9195
ADVERTISED_HOSTNAME: localhost
ZOOKEEPER_CONNECT: "localhost:2181"

networks:
pausenet:
2 changes: 1 addition & 1 deletion scripts/setup-test-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ docker ps > /dev/null || {
exit 1
}

VERSION=${KAFKA_VERSION:-1.1}
VERSION=${KAFKA_VERSION:-2.4}
if [ -z $VERSION ]; then VERSION=$1; fi

case $VERSION in
Expand Down
1 change: 1 addition & 0 deletions test/kpro_test_lib.erl
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ default_ssl_options() ->
, {keyfile, Fname("client.key")}
, {certfile, Fname("client.crt")}
, {verify, verify_none}
, {versions, ['tlsv1.2']}
].

osenv(Name) ->
Expand Down

0 comments on commit f22a8d8

Please sign in to comment.