From e096a81e822e3662eb98ba60e2427ed5bcdf21ce Mon Sep 17 00:00:00 2001 From: Zack Winter <3457246+zackwintermdb@users.noreply.github.com> Date: Wed, 28 Feb 2024 17:51:27 -0800 Subject: [PATCH] SERVER-87109 Fix packaging on enterprise-amazon2023-lto (#19324) GitOrigin-RevId: 1a3a74f4649beb1f8c1812496c13eeb878385003 --- .../variants/amazon/test_release.yml | 3 +++ evergreen/packager.py_run.sh | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/etc/evergreen_yml_components/variants/amazon/test_release.yml b/etc/evergreen_yml_components/variants/amazon/test_release.yml index 9bd52198d45..de75204153a 100644 --- a/etc/evergreen_yml_components/variants/amazon/test_release.yml +++ b/etc/evergreen_yml_components/variants/amazon/test_release.yml @@ -235,6 +235,9 @@ buildvariants: crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" test_flags: --excludeWithAnyTags=incompatible_with_amazon_linux,requires_ldap_pool,requires_v4_0,requires_external_data_source,requires_latch_analyzer has_packages: true + packager_script: packager_enterprise.py + packager_arch: x86_64 + packager_distro: amazon2023 multiversion_platform: amazon2023 multiversion_edition: enterprise multiversion_architecture: x86_64 diff --git a/evergreen/packager.py_run.sh b/evergreen/packager.py_run.sh index 4ed7c0b022d..f024abfa3b0 100644 --- a/evergreen/packager.py_run.sh +++ b/evergreen/packager.py_run.sh @@ -14,6 +14,11 @@ if [ "${has_packages}" != "true" ]; then # exit 1 fi +if [ -z ${packager_script+x} ]; then + echo "Error: packager run when packager_script is not set, please remove the package task from this variant (or variant task group) or set packager_script if this variant is intended to run the packager." + exit 1 +fi + cd buildscripts $python ${packager_script} --prefix $(pwd)/.. --distros ${packager_distro} --tarball $(pwd)/../mongodb-dist.tgz -s ${version} -m HEAD -a ${packager_arch} cd ..