From e9895101d823de26682795d779f6b46feec854df Mon Sep 17 00:00:00 2001 From: Mathew Robinson Date: Fri, 15 Nov 2019 15:33:50 +0000 Subject: SERVER-44543 mh binaries is never uploaded --- SConstruct | 4 ++-- etc/evergreen.yml | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index a5176211ffb..229280b8390 100644 --- a/SConstruct +++ b/SConstruct @@ -3900,7 +3900,7 @@ if get_option('install-mode') == 'hygienic': # TODO: we should be able to move this to where the mqlrun binary is # defined when AIB correctly uses environments instead of hooking into # the first environment used. - name="${MH_DIST_BASENAME}", + name="${MH_DIST_BASENAME}-binaries", ) env.AddPackageNameAlias( @@ -4108,7 +4108,7 @@ def add_version_to_distsrc(env, archive): env.AddDistSrcCallback(add_version_to_distsrc) env['SERVER_DIST_BASENAME'] = env.subst('mongodb-%s-$MONGO_DISTNAME' % (getSystemInstallName())) -env['MH_DIST_BASENAME'] = env.subst('mh-%s-$MONGO_DISTNAME' % (getSystemInstallName())) +env['MH_DIST_BASENAME'] = 'mh' if get_option('legacy-tarball') == 'true': if ('tar-dist' not in COMMAND_LINE_TARGETS and 'zip-dist' not in COMMAND_LINE_TARGETS and diff --git a/etc/evergreen.yml b/etc/evergreen.yml index f91859df734..14596652f9d 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -3819,8 +3819,6 @@ tasks: mv mongodb-src-*.${ext|tgz} distsrc.${ext|tgz} mv mongodb-*-debugsymbols.${ext|tgz} mongo-debugsymbols.tgz || true mv mongodb-*.${ext|tgz} mongodb-binaries.tgz - mv mh-*-debugsymbols.${ext|tgz} mh-debugsymbols.${ext|tgz} || true - mv mh-mongodb*.${ext|tgz} mh-binaries.${ext|tgz} || true # Tar unstripped dbtest, to be archived in case of failure - command: archive.targz_pack -- cgit v1.2.1