diff --git a/.expeditor/build.habitat.yml b/.expeditor/build.habitat.yml index b3dc0c6d712..9286c17df17 100644 --- a/.expeditor/build.habitat.yml +++ b/.expeditor/build.habitat.yml @@ -19,6 +19,8 @@ studio_secrets: OPENSEARCH_NODE1_KEY_PEM: path: secret/a2/a2ha/opensearch field: node1-key.pem + HAB_BLDR_CHANNEL: + value: "LTS-2024" HAB_FALLBACK_CHANNEL: value: "stable" GOPROXY: diff --git a/components/automate-es-gateway/habitat/plan.sh b/components/automate-es-gateway/habitat/plan.sh index 13eb24597f0..ac2ec918f86 100644 --- a/components/automate-es-gateway/habitat/plan.sh +++ b/components/automate-es-gateway/habitat/plan.sh @@ -39,26 +39,25 @@ chef_automate_hab_binding_mode="relaxed" pkg_svc_user="root" pkg_deps=( - core/glibc/2.35/20240105171810 - core/libedit/20210910-3.1/20240106023704 - core/ncurses/6.2/20240105212325 - core/zlib/1.3/20240105173710 - core/bzip2/1.0.8/20240105212113 - core/openssl/1.0.2zi/20240105224424 - #core/pcre2 - core/pcre/8.45/20240105213900 - core/coreutils/8.32/20240105213308 - chef/mlsa/1.0.1/20240125084021 - core/bash/5.1/20240105214248 - core/curl/8.7.1/20240614090648 #health_check - chef/automate-platform-tools/0.1.0/20241212061203 + core/glibc + core/libedit + core/ncurses + core/zlib + core/bzip2 + core/openssl + core/pcre2 + core/coreutils + chef/mlsa + core/bash + core/curl # health_check + chef/automate-platform-tools ) pkg_build_deps=( - core/gcc/9.5.0/20240105175314 - core/make/4.3/20240105222044 - core/coreutils/8.32/20240105213308 + core/gcc + core/make + core/coreutils ) pkg_lib_dirs=(lib) diff --git a/components/automate-load-balancer/habitat/plan.sh b/components/automate-load-balancer/habitat/plan.sh index c03400d84b7..5c4a69ab363 100644 --- a/components/automate-load-balancer/habitat/plan.sh +++ b/components/automate-load-balancer/habitat/plan.sh @@ -25,22 +25,21 @@ pkg_upstream_url="https://www.chef.io/automate" pkg_shasum=760729901acbaa517996e681ee6ea259032985e37c2768beef80df3a877deed9 pkg_deps=( - core/glibc/2.35/20240105171810 - core/libedit/20210910-3.1/20240106023704 - core/ncurses/6.2/20240105212325 - core/zlib/1.3/20240105173710 - core/bzip2/1.0.8/20240105212113 - core/openssl/1.0.2zi/20240105224424 - #core/pcre2 - core/pcre/8.45/20240105213900 - chef/mlsa/1.0.1/20240125084021 - core/bash/5.1/20240105214248 + core/glibc + core/libedit + core/ncurses + core/zlib + core/bzip2 + core/openssl/3.0.9 + core/pcre2 + chef/mlsa + core/bash ) pkg_build_deps=( - core/gcc/9.5.0/20240105175314 - core/make/4.3/20240105222044 - core/coreutils/8.32/20240105213308 + core/gcc + core/make + core/coreutils ) pkg_lib_dirs=(lib) pkg_bin_dirs=(sbin) diff --git a/integration/helpers/cert_auth_tests.sh b/integration/helpers/cert_auth_tests.sh index 938f9f844ad..91ff398e9db 100644 --- a/integration/helpers/cert_auth_tests.sh +++ b/integration/helpers/cert_auth_tests.sh @@ -12,7 +12,7 @@ cert_auth_tests() { log_info "Starting the Certificate Authentication test suite" - hab pkg install core/curl -c stable + hab pkg install core/curl #shellcheck disable=SC2154 log_info "Generating policy to allow ${authorized_service_name} to GET the data collector endpoint" grant_permissions