Skip to content

Commit 087050d

Browse files
authored
fix: integration-test (#911)
Signed-off-by: Yvonnick Esnault <yvonnick.esnault@ovhcloud.com>
1 parent bd4612c commit 087050d

3 files changed

Lines changed: 10 additions & 3 deletions

File tree

tests/Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,11 @@ venom-sshd.cid:
5252
$(call docker_run,ghcr.io/linuxserver/openssh-server,sshd,-p 2222:2222 -e PUID=1000 -e PGID=1000 -e TZ=Europe/London -e PUBLIC_KEY="$(shell cat ~/.ssh/id_rsa.pub)" -e USER_NAME=venom -e PASSWORD_ACCESS=true -e USER_PASSWORD=testvenom -e SUDO_ACCESS=true)
5353
venom-mqtt.cid:
5454
$(call docker_run,eclipse-mosquitto,mqtt-broker,-p 1883:1883 -p 9001:9001 -v $(shell realpath mqtt/mosquitto.conf):/mosquitto/config/mosquitto.conf:ro)
55+
venom-qpid.cid:
56+
$(call docker_run,scholzj/qpid-cpp:1.39.0,qpid,-p 5673:5672)
57+
@printf "waiting for QPID broker to be ready..." ; \
58+
until docker exec venom-qpid qpid-config -b 127.0.0.1:5672 add queue amqp-test 2>/dev/null; do sleep 1; done ; \
59+
echo " done"
5560
venom-grpc.cid:
5661
docker build -t venom-grpc-greeter ./grpc
5762
$(call docker_run,venom-grpc-greeter,grpc,-p 50051:50051)
@@ -68,6 +73,7 @@ start-test-stack: venom-kafka.cid
6873
start-test-stack: venom-rabbit.cid
6974
start-test-stack: venom-sshd.cid
7075
start-test-stack: venom-mqtt.cid
76+
start-test-stack: venom-qpid.cid
7177
start-test-stack: $(PKI_DIR)
7278
start-test-stack: venom-httpbin.cid
7379
start-test-stack: venom-grpc.cid
@@ -82,7 +88,7 @@ build-test-binary:
8288
CGO_ENABLED=1 go test -coverpkg $$TEMP -c . -o ../../tests/venom.test -ldflags "-X github.com/ovh/venom.IsTest=true" -tags testbincover;
8389

8490
build-test-binary-docker:
85-
docker run -v `pwd`/..:/workspace golang:1.25 sh -c "cd /workspace/tests && make build-test-binary"
91+
docker run -v `pwd`/..:/workspace golang:1.26 sh -c "cd /workspace/tests && make build-test-binary"
8692

8793
run-test: generate-venom-pki
8894
VENOM_VAR_MY_ENVAR=foo ./venom_wrapper.sh run \
@@ -99,7 +105,7 @@ clean:
99105
@rm -f *.prof *.html *.xml *.log *.dump.json *.args.file *.error.out *.out *.test.out *.coverprofile
100106

101107
merge-coverage:
102-
@docker run -v `pwd`:/workspace golang:1.25 sh -c "\
108+
@docker run -v `pwd`:/workspace golang:1.26 sh -c "\
103109
go install github.com/wadey/gocovmerge@latest && \
104110
cd /workspace && \
105111
gocovmerge $(COVER_FILES) > /workspace/venom.cover.out \

tests/grpc/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.25-trixie
1+
FROM golang:1.26
22

33
WORKDIR /app
44

tests/web.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ vars:
44
driver: gecko
55
width: 1920
66
height: 1080
7+
headless: true
78
# driver: chrome
89
# args:
910
# - "--headless"

0 commit comments

Comments
 (0)