From e5dfd405b3f554561db4a830f1b4164741388fb4 Mon Sep 17 00:00:00 2001 From: William Lallemand Date: Thu, 14 Oct 2021 11:06:16 +0200 Subject: [PATCH] REGTESTS: ssl: re-enable set_ssl_cert_bundle.vtc The new "ssllib_name_startswith(OpenSSL)" command allows us to reactivate set_ssl_cert_bundle.vtc with >= OpenSSL 1.1.1 only. --- reg-tests/ssl/set_ssl_cert_bundle.vtc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/reg-tests/ssl/set_ssl_cert_bundle.vtc b/reg-tests/ssl/set_ssl_cert_bundle.vtc index 11abdafdd..eba00deca 100644 --- a/reg-tests/ssl/set_ssl_cert_bundle.vtc +++ b/reg-tests/ssl/set_ssl_cert_bundle.vtc @@ -1,4 +1,4 @@ -#REGTEST_TYPE=broken +#REGTEST_TYPE=devel # This reg-test uses the "set ssl cert" command to update a multi-certificate # bundle over the CLI. @@ -12,11 +12,12 @@ # # If this test does not work anymore: # - Check that you have socat -# - Check that you have at least OpenSSL 1.1.0 +# - Check that you have at least OpenSSL 1.1.1 varnishtest "Test the 'set ssl cert' feature of the CLI with bundles" -#REQUIRE_VERSION=2.3 -#REQUIRE_OPTIONS=OPENSSL +# could work with haproxy 2.3 but the -cc is not available +feature cmd "$HAPROXY_PROGRAM -cc 'version_atleast(2.5-dev9)'" +feature cmd "$HAPROXY_PROGRAM -cc 'feature(OPENSSL) && ssllib_name_startswith(OpenSSL) && openssl_version_atleast(1.1.1)'" feature cmd "command -v socat" feature ignore_unknown_macro