This is an automated email from the ASF dual-hosted git repository.
xyz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar-client-go.git
The following commit(s) were added to refs/heads/master by this push:
new 8c193de1 Upgrade pulsar image to 4.0.0 (#1304)
8c193de1 is described below
commit 8c193de11b26a48c5895d47ea89b72e9ee155163
Author: crossoverJie <[email protected]>
AuthorDate: Fri Nov 1 13:16:41 2024 +0800
Upgrade pulsar image to 4.0.0 (#1304)
---
Dockerfile | 2 +-
Makefile | 2 +-
integration-tests/blue-green/docker-compose.yml | 12 ++++++------
integration-tests/clustered/docker-compose.yml | 12 ++++++------
integration-tests/extensible-load-manager/docker-compose.yml | 12 ++++++------
scripts/run-ci.sh | 1 +
6 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 8895c076..6ddb7712 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,7 +29,7 @@ COPY --from=golang /usr/local/go /pulsar/go
ENV PATH /pulsar/go/bin:$PATH
-RUN apt-get update && apt-get install -y git gcc
+RUN apk add git gcc musl-dev
### Add pulsar config
COPY integration-tests/certs /pulsar/certs
diff --git a/Makefile b/Makefile
index 5c38303e..1ee6874d 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
#
IMAGE_NAME = pulsar-client-go-test:latest
-PULSAR_VERSION ?= 3.2.2
+PULSAR_VERSION ?= 4.0.0
PULSAR_IMAGE = apachepulsar/pulsar:$(PULSAR_VERSION)
GO_VERSION ?= 1.22
CONTAINER_ARCH ?= $(shell uname -m | sed s/x86_64/amd64/)
diff --git a/integration-tests/blue-green/docker-compose.yml
b/integration-tests/blue-green/docker-compose.yml
index b026ce88..f04e24ff 100644
--- a/integration-tests/blue-green/docker-compose.yml
+++ b/integration-tests/blue-green/docker-compose.yml
@@ -52,12 +52,12 @@ services:
environment:
- PULSAR_MEM=-Xms128m -Xmx128m -XX:MaxDirectMemorySize=56m
command: >
- bin/pulsar initialize-cluster-metadata \
- --cluster cluster-green \
- --zookeeper green-zookeeper:2181 \
- --configuration-store green-zookeeper:2181 \
- --web-service-url http://green-broker-1:8080 \
- --broker-service-url pulsar://green-broker-1:6650
+ bash -c "bin/pulsar initialize-cluster-metadata \
+ --cluster cluster-green \
+ --zookeeper green-zookeeper:2181 \
+ --configuration-store green-zookeeper:2181 \
+ --web-service-url http://green-broker-1:8080 \
+ --broker-service-url pulsar://green-broker-1:6650"
depends_on:
green-zookeeper:
condition: service_healthy
diff --git a/integration-tests/clustered/docker-compose.yml
b/integration-tests/clustered/docker-compose.yml
index cce8eddd..eb96ca9e 100644
--- a/integration-tests/clustered/docker-compose.yml
+++ b/integration-tests/clustered/docker-compose.yml
@@ -50,12 +50,12 @@ services:
environment:
- PULSAR_MEM=-Xms128m -Xmx128m -XX:MaxDirectMemorySize=56m
command: >
- bin/pulsar initialize-cluster-metadata \
- --cluster cluster-a \
- --zookeeper zookeeper:2181 \
- --configuration-store zookeeper:2181 \
- --web-service-url http://broker-1:8080 \
- --broker-service-url pulsar://broker-1:6650
+ bash -c "bin/pulsar initialize-cluster-metadata \
+ --cluster cluster-a \
+ --zookeeper zookeeper:2181 \
+ --configuration-store zookeeper:2181 \
+ --web-service-url http://broker-1:8080 \
+ --broker-service-url pulsar://broker-1:6650"
depends_on:
zookeeper:
condition: service_healthy
diff --git a/integration-tests/extensible-load-manager/docker-compose.yml
b/integration-tests/extensible-load-manager/docker-compose.yml
index 935afdce..063a2350 100644
--- a/integration-tests/extensible-load-manager/docker-compose.yml
+++ b/integration-tests/extensible-load-manager/docker-compose.yml
@@ -50,12 +50,12 @@ services:
environment:
- PULSAR_MEM=-Xms128m -Xmx128m -XX:MaxDirectMemorySize=56m
command: >
- bin/pulsar initialize-cluster-metadata \
- --cluster cluster-a \
- --zookeeper zookeeper:2181 \
- --configuration-store zookeeper:2181 \
- --web-service-url http://broker-1:8080 \
- --broker-service-url pulsar://broker-1:6650
+ bash -c "bin/pulsar initialize-cluster-metadata \
+ --cluster cluster-a \
+ --zookeeper zookeeper:2181 \
+ --configuration-store zookeeper:2181 \
+ --web-service-url http://broker-1:8080 \
+ --broker-service-url pulsar://broker-1:6650"
depends_on:
zookeeper:
condition: service_healthy
diff --git a/scripts/run-ci.sh b/scripts/run-ci.sh
index e7a6d79e..cb58a1dc 100755
--- a/scripts/run-ci.sh
+++ b/scripts/run-ci.sh
@@ -21,6 +21,7 @@ set -e -x
scripts/pulsar-test-service-start.sh
+export CGO_ENABLED=1
go test -race -coverprofile=/tmp/coverage -timeout=20m -v ./...
go tool cover -html=/tmp/coverage -o coverage.html
