Skip to content

Commit 97b010c

Browse files
committed
TEST/MINOR: program: fix tests for deprecated section
1 parent 5f49be4 commit 97b010c

File tree

3 files changed

+34
-2
lines changed

3 files changed

+34
-2
lines changed

e2e/run.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set -eo pipefail
1818

1919
export BASE_PATH="/v3"
2020

21-
HAPROXY_VERSION=${HAPROXY_VERSION:-2.9}
21+
HAPROXY_VERSION=${HAPROXY_VERSION:-3.2}
2222
DOCKER_BASE_IMAGE="${DOCKER_BASE_IMAGE:-haproxytech/haproxy-debian}:${HAPROXY_VERSION}"
2323
DOCKER_CONTAINER_NAME="dataplaneapi-e2e"
2424
export DOCKER_CONTAINER_NAME

e2e/tests/process_manager/data/haproxy.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# _version=42
22

33
global
4-
expose-deprecated-directives
54
master-worker
65
log 127.0.0.1 local2
76
chroot /var/lib/haproxy
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# _version=42
2+
3+
global
4+
expose-deprecated-directives
5+
master-worker
6+
log 127.0.0.1 local2
7+
chroot /var/lib/haproxy
8+
pidfile /var/run/haproxy.pid
9+
maxconn 4000
10+
user haproxy
11+
group haproxy
12+
stats socket /var/lib/haproxy/stats level admin
13+
14+
defaults mydefaults
15+
mode http
16+
log global
17+
option httplog
18+
option dontlognull
19+
option http-server-close
20+
option forwardfor except 127.0.0.0/8
21+
option redispatch
22+
retries 3
23+
timeout http-request 10s
24+
timeout queue 1m
25+
timeout connect 10s
26+
timeout client 1m
27+
timeout server 1m
28+
timeout http-keep-alive 10s
29+
timeout check 10s
30+
maxconn 3000
31+
32+
program echo
33+
command echo "Hello, World!"

0 commit comments

Comments
 (0)