Install socat and lua for more haproxy unit tests

aws · Jul 17, 2023 · c5f6c8f · c5f6c8f
1 parent 1dd5cf9
commit c5f6c8f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/tests/ci/docker_images/linux-x86/ubuntu-22.04_base/Dockerfile b/tests/ci/docker_images/linux-x86/ubuntu-22.04_base/Dockerfile
@@ -43,11 +43,12 @@ RUN set -ex && \
     libpcre2-dev \
     libreadline-dev \
     libudev-dev \
+    liblua5.4-dev \
+    socat \
     zlib1g-dev \
     dpkg-dev \
     flex \
     bison \
-    curl \
     jq \
     unzip && \
     # Based on https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2-linux.html

diff --git a/tests/ci/integration/run_haproxy_integration.sh b/tests/ci/integration/run_haproxy_integration.sh
@@ -25,10 +25,12 @@ export LD_LIBRARY_PATH="${AWS_LC_INSTALL_FOLDER}/lib"
 
 function build_and_test_haproxy() {
   cd ${HAPROXY_SRC}
-  make CC="${CC}" -j ${NUM_CPU_THREADS} TARGET=generic USE_OPENSSL=1 SSL_INC="${AWS_LC_INSTALL_FOLDER}/include" SSL_LIB="${AWS_LC_INSTALL_FOLDER}/lib/"
+  make CC="${CC}" -j ${NUM_CPU_THREADS} TARGET=generic USE_OPENSSL=1 SSL_INC="${AWS_LC_INSTALL_FOLDER}/include" \
+      SSL_LIB="${AWS_LC_INSTALL_FOLDER}/lib/" USE_LUA=1  LUA_LIB_NAME=lua5.4
 
-  # These tests pass when run locally but are not supported in CodeBuild, see CryptoAlg-1965
-  excluded_tests=("mcli_show_info.vtc" "mcli_start_progs.vtc" "tls_basic_sync.vtc" "tls_basic_sync_wo_stkt_backend.vtc" "acl_cli_spaces.vtc" "http_reuse_always.vtc")
+  # This test expects to use libssl with a FFDH ciphersuite which is unsupported, it will be gracefully turned off in
+  # ssl_dh.vtc with the change in https://github.com/andrewhop/haproxy/pull/1
+  excluded_tests=("ssl_dh.vtc")
   test_paths=""
 
   for test in reg-tests/**/*; do
@@ -52,12 +54,12 @@ cd haproxy
 export VTEST_PROGRAM=$(realpath ../vtest/vtest)
 
 # Test with static AWS-LC libraries
-aws_lc_build ${SRC_ROOT} ${AWS_LC_BUILD_FOLDER} ${AWS_LC_INSTALL_FOLDER} -DBUILD_SHARED_LIBS=0
+aws_lc_build ${SRC_ROOT} ${AWS_LC_BUILD_FOLDER} ${AWS_LC_INSTALL_FOLDER} -DBUILD_SHARED_LIBS=0 -DBUILD_TESTING=0
 build_and_test_haproxy $HAPROXY_SRC
 
 rm -rf ${AWS_LC_INSTALL_FOLDER}/*
 rm -rf ${AWS_LC_BUILD_FOLDER}/*
 
 # Test with shared AWS-LC libraries
-aws_lc_build ${SRC_ROOT} ${AWS_LC_BUILD_FOLDER} ${AWS_LC_INSTALL_FOLDER} -DBUILD_SHARED_LIBS=1
+aws_lc_build ${SRC_ROOT} ${AWS_LC_BUILD_FOLDER} ${AWS_LC_INSTALL_FOLDER} -DBUILD_SHARED_LIBS=1 -DBUILD_TESTING=0
 build_and_test_haproxy $HAPROXY_SRC