TEST/MINOR: e2e: upgrade e2e tests to haproxy 3.1

Author: mjuraga

.gitlab-ci.yml

@@ -180,45 +180,9 @@ govulncheck:
     - go mod tidy
     - go run cmd/govulncheck-report/main.go
 
-HAProxy_2_2:
-  extends: .e2e
-  parallel:
-    matrix:
-      - TESTPART: ["1/2", "2/2"]
-        HAPROXY_VERSION: "2.2"
-HAProxy_2_4:
-  extends: .e2e
-  parallel:
-    matrix:
-      - TESTPART: ["1/2", "2/2"]
-        HAPROXY_VERSION: "2.4"
-HAProxy_2_6:
-  extends: .e2e
-  parallel:
-    matrix:
-      - TESTPART: ["1/2", "2/2"]
-        HAPROXY_VERSION: "2.6"
-HAProxy_2_8:
-  extends: .e2e
-  parallel:
-    matrix:
-      - TESTPART: ["1/2", "2/2"]
-        HAPROXY_VERSION: "2.8"
-HAProxy_2_9:
-  extends: .e2e
-  parallel:
-    matrix:
-      - TESTPART: ["1/2", "2/2"]
-        HAPROXY_VERSION: "2.9"
-HAProxy_3_0:
-  extends: .e2e
-  parallel:
-    matrix:
-      - TESTPART: ["1/2", "2/2"]
-        HAPROXY_VERSION: "3.0"
 HAProxy_3_1:
   extends: .e2e
   parallel:
     matrix:
-      - TESTPART: ["1/2", "2/2"]
-        HAPROXY_VERSION: "3.0"
+      - TESTPART: ["1/4", "2/4", "3/4", "4/4"]
+        HAPROXY_VERSION: "3.1"

e2e/run.bash

@@ -18,7 +18,7 @@ set -eo pipefail
 
 export BASE_PATH="/v3"
 
-HAPROXY_VERSION=${HAPROXY_VERSION:-2.9}
+HAPROXY_VERSION=${HAPROXY_VERSION:-3.1}
 DOCKER_BASE_IMAGE="${DOCKER_BASE_IMAGE:-haproxytech/haproxy-debian}:${HAPROXY_VERSION}"
 DOCKER_CONTAINER_NAME="dataplaneapi-e2e"
 export DOCKER_CONTAINER_NAME