TEST/MINOR: e2e: swap kill -SIGUSR with kill -s 12 invocations

haproxytech · Dec 8, 2023 · 3351e3c · 3351e3c
1 parent 38e313f
commit 3351e3c
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -4,7 +4,7 @@ stages:
   - e2e
 variables:
   DOCKER_HOST: tcp://docker:2375
-  DOCKER_BASE_IMAGE: $CI_REGISTRY_GO/haproxy-alpine
+  DOCKER_BASE_IMAGE: haproxytech/haproxy-debian
   BATS_VERSION: v1.4.1
   GO_VERSION: '1.21'
 

diff --git a/e2e/fixtures/dataplaneapi-master-socket.yaml b/e2e/fixtures/dataplaneapi-master-socket.yaml
@@ -15,8 +15,8 @@ haproxy:
   master_runtime: /var/lib/haproxy/master
   master_worker_mode: true
   reload:
-    reload_cmd: kill -SIGUSR2 1
-    restart_cmd: kill -SIGUSR2 1
+    reload_cmd: kill -s 12 1
+    restart_cmd: kill -s 12 1
 log:
   log_to: file
   log_file: /var/log/dataplaneapi.log

diff --git a/e2e/fixtures/dataplaneapi.yaml b/e2e/fixtures/dataplaneapi.yaml
@@ -13,8 +13,8 @@ haproxy:
   config_file: /etc/haproxy/haproxy.cfg
   haproxy_bin: /usr/local/sbin/haproxy
   reload:
-    reload_cmd: kill -SIGUSR2 1
-    restart_cmd: kill -SIGUSR2 1
+    reload_cmd: kill -s 12 1
+    restart_cmd: kill -s 12 1
 log:
   log_to: file
   log_file: /var/log/dataplaneapi.log

diff --git a/e2e/libs/haproxy_config_setup.bash b/e2e/libs/haproxy_config_setup.bash
@@ -72,7 +72,7 @@ setup() {
       assert_success
   fi
 
-  run dpa_docker_exec 'kill -SIGUSR2 1'
+  run dpa_docker_exec 'kill -s 12 1'
   assert_success
 
   run dpa_docker_exec 'pkill -9 dataplaneapi'
@@ -111,7 +111,7 @@ teardown() {
   run docker cp "${E2E_DIR}/fixtures/dataplaneapi.yaml" "${DOCKER_CONTAINER_NAME}:/etc/haproxy/dataplaneapi.yaml"
   assert_success
 
-  run dpa_docker_exec 'kill -SIGUSR2 1'
+  run dpa_docker_exec 'kill -s 12 1'
   assert_success
 
   run dpa_docker_exec 'pkill -9 dataplaneapi'

diff --git a/e2e/run.bash b/e2e/run.bash
@@ -19,7 +19,7 @@ set -eo pipefail
 export BASE_PATH="/v2"
 
 HAPROXY_VERSION=${HAPROXY_VERSION:-2.9}
-DOCKER_BASE_IMAGE="${DOCKER_BASE_IMAGE:-haproxytech/haproxy-alpine}:${HAPROXY_VERSION}"
+DOCKER_BASE_IMAGE="${DOCKER_BASE_IMAGE:-haproxytech/haproxy-debian}:${HAPROXY_VERSION}"
 DOCKER_CONTAINER_NAME="dataplaneapi-e2e"
 export DOCKER_CONTAINER_NAME
 

diff --git a/e2e/tests/set_uid/dataplaneapi.yaml b/e2e/tests/set_uid/dataplaneapi.yaml
@@ -15,5 +15,5 @@ haproxy:
   config_file: /home/testuiduser/haproxy.cfg
   haproxy_bin: /usr/local/sbin/haproxy
   reload:
-    reload_cmd: kill -SIGUSR2 1
-    restart_cmd: kill -SIGUSR2 1
+    reload_cmd: kill -s 12 1
+    restart_cmd: kill -s 12 1
diff --git a/e2e/tests/set_uid/test.bats b/e2e/tests/set_uid/test.bats
@@ -18,7 +18,7 @@
 load '../../libs/dataplaneapi'
 
 setup() {
-  run dpa_docker_exec 'kill -SIGUSR2 1'
+  run dpa_docker_exec 'kill -s 12 1'
   assert_success
 
   run dpa_docker_exec 'pkill -9 dataplaneapi'
@@ -48,7 +48,7 @@ teardown() {
   run docker cp "${E2E_DIR}/fixtures/dataplaneapi.yaml" "${DOCKER_CONTAINER_NAME}:/usr/local/bin/dataplaneapi.yaml"
   assert_success
 
-  run dpa_docker_exec 'kill -SIGUSR2 1'
+  run dpa_docker_exec 'kill -s 12 1'
   assert_success
 
   run dpa_docker_exec 'pkill -9 dataplaneapi'

diff --git a/e2e/tests/storage_maps/test.bats b/e2e/tests/storage_maps/test.bats
@@ -41,7 +41,7 @@ load 'utils/_helpers'
 
     # sometimes we can't establish a connection to the haproxy stat socket
     # forcing haproxy to restart seems to fix that
-    assert dpa_docker_exec 'kill -SIGUSR2 1'
+    assert dpa_docker_exec 'kill -s 12 1'
     sleep 1
 
     resource_get "$_STORAGE_MAPS_BASE_PATH/"