diff options
| author | mo khan <mo.khan@gmail.com> | 2020-09-10 14:53:17 -0600 |
|---|---|---|
| committer | mo khan <mo.khan@gmail.com> | 2020-09-10 14:53:17 -0600 |
| commit | dc1d9a1d71715347c3936dc99c31ab94cee41341 (patch) | |
| tree | 6ff0480c1531b0bc02b8c0111cba9eb92e3a85cd | |
| parent | aa44fb0d5ca05da6780869fb187985a4600cb969 (diff) | |
chore: Use modern version of haproxy for tests
| -rwxr-xr-x | bin/setup | 4 | ||||
| -rw-r--r-- | spec/fixtures/haproxy.cfg | 1 |
2 files changed, 4 insertions, 1 deletions
@@ -7,7 +7,9 @@ cd "$(dirname "$0")/.." export PATH="/builds/gitlab-org/security-products/license-management/exe:/opt/gitlab/embedded/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" if [ ! -f /usr/sbin/haproxy ] && command -v apt-get; then - apt-get update -y && apt-get install -y --no-install-recommends git haproxy + curl https://haproxy.debian.net/bernat.debian.org.gpg | apt-key add - + echo deb http://haproxy.debian.net buster-backports-2.2 main | tee /etc/apt/sources.list.d/haproxy.list + apt-get update -y && apt-get install -y --no-install-recommends haproxy=2.2.\* fi [[ -z "$CI_JOB_ID" ]] && enable_dev_mode diff --git a/spec/fixtures/haproxy.cfg b/spec/fixtures/haproxy.cfg index d5b2647..a13bd72 100644 --- a/spec/fixtures/haproxy.cfg +++ b/spec/fixtures/haproxy.cfg @@ -3,6 +3,7 @@ global ca-base ./tmp crt-base ./tmp tune.ssl.default-dh-param 4096 + log stdout local0 debug defaults log global |