diff --git a/etc/evergreen_yml_components/tasks/compile_tasks_nightly.yml b/etc/evergreen_yml_components/tasks/compile_tasks_nightly.yml index 307513e2c73..a1eeedb1c0c 100644 --- a/etc/evergreen_yml_components/tasks/compile_tasks_nightly.yml +++ b/etc/evergreen_yml_components/tasks/compile_tasks_nightly.yml @@ -166,9 +166,6 @@ tasks: - func: "fetch packages" - func: "fetch msi files" - func: "fetch dist tarball" - - func: "fetch binaries" - vars: - local_file: src/mongo-dist-test.tgz # Fetch mongocryptd - command: s3.get params: @@ -194,18 +191,6 @@ tasks: args: - "./src/evergreen/garasign_gpg_sign.sh" - # Put the dist-test binaries tarball/zipfile - - command: s3.put - params: - aws_secret: ${aws_secret} - local_file: src/mongodb-dist-test-${push_name}-${push_arch}-${suffix}.${ext|tgz} - aws_key: ${aws_key} - bucket: ${push_bucket} - permissions: ${mciuploads_binary_permissions_push|private} - visibility: ${mciuploads_binary_visibility_push|signed} - content_type: ${content_type|application/gzip} - remote_file: ${push_path}/mongodb-dist-test-${push_name}-${push_arch}-${suffix}.${ext|tgz} - skip_existing: ${is_release} # Put the binaries tarball/zipfile - command: s3.put params: @@ -248,18 +233,6 @@ tasks: optional: true # Put the binaries tarball signature - - command: s3.put - params: - aws_secret: ${aws_secret} - local_file: src/mongodb-dist-test-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sig - aws_key: ${aws_key} - bucket: ${push_bucket} - permissions: ${mciuploads_binary_permissions_push|private} - visibility: ${mciuploads_binary_visibility_push|signed} - content_type: ${content_type|application/gzip} - remote_file: ${push_path}/mongodb-dist-test-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sig - skip_existing: ${is_release} - # Put the binaries tarball signature - command: s3.put params: aws_secret: ${aws_secret} @@ -656,16 +629,6 @@ tasks: content_type: text/plain # Put the binaries tarball md5 - - command: s3.put - params: - role_arn: ${push_role_arn} - local_file: src/mongodb-dist-test-${push_name}-${push_arch}-${suffix}.${ext|tgz}.md5 - bucket: ${push_bucket_new} - permissions: private - content_type: text/plain - remote_file: ${push_path}/mongodb-${push_name}-${push_arch}-${suffix}.${ext|tgz}.md5 - skip_existing: ${is_release} - # Put the binaries tarball md5 - command: s3.put params: role_arn: ${push_role_arn} @@ -719,8 +682,6 @@ tasks: env: SERVER_TARBALL_PATH: src/mongodb-${push_name}-${push_arch}-${suffix}.${ext|tgz} SERVER_TARBALL_KEY: ${version_id}/${build_id}/push/${push_path}/mongodb-${push_name}-${push_arch}-${suffix}.${ext|tgz} - DIST_TEST_TARBALL_PATH: src/mongodb-dist-test-${push_name}-${push_arch}-${suffix}.${ext|tgz} - DIST_TEST_TARBALL_KEY: ${version_id}/${build_id}/push/${push_path}/mongodb-dist-test-${push_name}-${push_arch}-${suffix}.${ext|tgz} CRYPTD_TARBALL_PATH: src/mongodb-cryptd-${push_name}-${push_arch}-${suffix}.${ext|tgz} CRYPTD_TARBALL_KEY: ${version_id}/${build_id}/push/${push_path}/mongodb-cryptd-${push_name}-${push_arch}-${suffix}.${ext|tgz} SOURCE_TARBALL_PATH: src/mongodb-src-${src_suffix}.${ext|tar.gz} @@ -729,8 +690,6 @@ tasks: DEBUG_SYMBOLS_TARBALL_KEY: ${version_id}/${build_id}/push/${push_path}/mongodb-${push_name}-${push_arch}-debugsymbols-${suffix}.${ext|tgz} SERVER_TARBALL_SIGNATURE_PATH: src/mongodb-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sig SERVER_TARBALL_SIGNATURE_KEY: ${version_id}/${build_id}/push/${push_path}/mongodb-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sig - DIST_TEST_TARBALL_SIGNATURE_PATH: src/mongodb-dist-test-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sig - DIST_TEST_TARBALL_SIGNATURE_KEY: ${version_id}/${build_id}/push/${push_path}/mongodb-dist-test-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sig CRYPTD_TARBALL_SIGNATURE_PATH: src/mongodb-cryptd-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sig CRYPTD_TARBALL_SIGNATURE_KEY: ${version_id}/${build_id}/push/${push_path}/mongodb-cryptd-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sig SOURCE_TARBALL_SIGNATURE_PATH: src/mongodb-src-${src_suffix}.${ext|tar.gz}.sig @@ -741,8 +700,6 @@ tasks: MSI_KEY: ${version_id}/${build_id}/push/${push_path}/mongodb-${push_name}-${push_arch}-${suffix}-signed.msi SERVER_TARBALL_SHA1_PATH: src/mongodb-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha1 SERVER_TARBALL_SHA1_KEY: ${version_id}/${build_id}/push/${push_path}/mongodb-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha1 - DIST_TEST_TARBALL_SHA1_PATH: src/mongodb-dist-test-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha1 - DIST_TEST_TARBALL_SHA1_KEY: ${version_id}/${build_id}/push/${push_path}/mongodb-dist-test-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha1 CRYPTD_TARBALL_SHA1_PATH: src/mongodb-cryptd-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha1 CRYPTD_TARBALL_SHA1_KEY: ${version_id}/${build_id}/push/${push_path}/mongodb-cryptd-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha1 SOURCE_TARBALL_SHA1_PATH: src/mongodb-src-${src_suffix}.${ext|tar.gz}.sha1 @@ -753,8 +710,6 @@ tasks: MSI_SHA1_KEY: ${version_id}/${build_id}/push/${push_path}/mongodb-${push_name}-${push_arch}-${suffix}-signed.msi.sha1 SERVER_TARBALL_SHA256_PATH: src/mongodb-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha256 SERVER_TARBALL_SHA256_KEY: ${version_id}/${build_id}/push/${push_path}/mongodb-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha256 - DIST_TEST_TARBALL_SHA256_PATH: src/mongodb-dist-test-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha256 - DIST_TEST_TARBALL_SHA256_KEY: ${version_id}/${build_id}/push/${push_path}/mongodb-dist-test-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha256 CRYPTD_TARBALL_SHA256_PATH: src/mongodb-cryptd-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha256 CRYPTD_TARBALL_SHA256_KEY: ${version_id}/${build_id}/push/${push_path}/mongodb-cryptd-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha256 @@ -766,8 +721,6 @@ tasks: MSI_SHA256_KEY: ${version_id}/${build_id}/push/${push_path}/mongodb-${push_name}-${push_arch}-${suffix}-signed.msi.sha256 SERVER_TARBALL_MD5_PATH: src/mongodb-${push_name}-${push_arch}-${suffix}.${ext|tgz}.md5 SERVER_TARBALL_MD5_KEY: ${version_id}/${build_id}/push/${push_path}/mongodb-${push_name}-${push_arch}-${suffix}.${ext|tgz}.md5 - DIST_TEST_TARBALL_MD5_PATH: src/mongodb-dist-test-${push_name}-${push_arch}-${suffix}.${ext|tgz}.md5 - DIST_TEST_TARBALL_MD5_KEY: ${version_id}/${build_id}/push/${push_path}/mongodb-dist-test-${push_name}-${push_arch}-${suffix}.${ext|tgz}.md5 CRYPTD_TARBALL_MD5_PATH: src/mongodb-cryptd-${push_name}-${push_arch}-${suffix}.${ext|tgz}.md5 CRYPTD_TARBALL_MD5_KEY: ${version_id}/${build_id}/push/${push_path}/mongodb-cryptd-${push_name}-${push_arch}-${suffix}.${ext|tgz}.md5 SOURCE_TARBALL_MD5_PATH: src/mongodb-src-${src_suffix}.${ext|tar.gz}.md5 diff --git a/evergreen/garasign_gpg_sign.sh b/evergreen/garasign_gpg_sign.sh index 645574ed65a..781e5903900 100644 --- a/evergreen/garasign_gpg_sign.sh +++ b/evergreen/garasign_gpg_sign.sh @@ -15,7 +15,6 @@ if [ "$long_ext" == "tgz" ]; then fi mv mongo-binaries.tgz mongodb-${push_name}-${push_arch}-${suffix}.${ext} -mv mongo-dist-test.tgz mongodb-dist-test-${push_name}-${push_arch}-${suffix}.${ext} mv mongo-cryptd.tgz mongodb-cryptd-${push_name}-${push_arch}-${suffix}.${ext} || true mv mh.tgz mh-${push_name}-${push_arch}-${suffix}.${ext} || true mv mongo-debugsymbols.tgz mongodb-${push_name}-${push_arch}-debugsymbols-${suffix}.${ext} || true @@ -33,7 +32,6 @@ function gen_checksums() { } gen_checksums mongodb-$push_name-$push_arch-$suffix.$ext -gen_checksums mongodb-dist-test-$push_name-$push_arch-$suffix.$ext gen_checksums mongodb-$push_name-$push_arch-debugsymbols-$suffix.$ext gen_checksums mongodb-src-$src_suffix.$long_ext gen_checksums mongodb-cryptd-$push_name-$push_arch-$suffix.$ext @@ -54,7 +52,6 @@ EOF cat <>gpg_signing_commands.sh sign mongodb-$push_name-$push_arch-$suffix.$ext -sign mongodb-dist-test-$push_name-$push_arch-$suffix.$ext sign mongodb-$push_name-$push_arch-debugsymbols-$suffix.$ext sign mongodb-src-$src_suffix.$long_ext sign mongodb-cryptd-$push_name-$push_arch-$suffix.$ext diff --git a/evergreen/run_upload_lock_push.sh b/evergreen/run_upload_lock_push.sh index ea7b20ebe65..ee5f9875670 100755 --- a/evergreen/run_upload_lock_push.sh +++ b/evergreen/run_upload_lock_push.sh @@ -8,19 +8,14 @@ # there first declare -A ARTIFACTS=( [${SERVER_TARBALL_PATH}]=${SERVER_TARBALL_KEY} - [${DIST_TEST_TARBALL_PATH}]=${DIST_TEST_TARBALL_KEY} [${SOURCE_TARBALL_PATH}]=${SOURCE_TARBALL_KEY} [${SERVER_TARBALL_SIGNATURE_PATH}]=${SERVER_TARBALL_SIGNATURE_KEY} - [${DIST_TEST_TARBALL_SIGNATURE_PATH}]=${DIST_TEST_TARBALL_SIGNATURE_KEY} [${SOURCE_TARBALL_SIGNATURE_PATH}]=${SOURCE_TARBALL_SIGNATURE_KEY} [${SERVER_TARBALL_SHA1_PATH}]=${SERVER_TARBALL_SHA1_KEY} - [${DIST_TEST_TARBALL_SHA1_PATH}]=${DIST_TEST_TARBALL_SHA1_KEY} [${SOURCE_TARBALL_SHA1_PATH}]=${SOURCE_TARBALL_SHA1_KEY} [${SERVER_TARBALL_SHA256_PATH}]=${SERVER_TARBALL_SHA256_KEY} - [${DIST_TEST_TARBALL_SHA256_PATH}]=${DIST_TEST_TARBALL_SHA256_KEY} [${SOURCE_TARBALL_SHA256_PATH}]=${SOURCE_TARBALL_SHA256_KEY} [${SERVER_TARBALL_MD5_PATH}]=${SERVER_TARBALL_MD5_KEY} - [${DIST_TEST_TARBALL_MD5_PATH}]=${DIST_TEST_TARBALL_MD5_KEY} [${SOURCE_TARBALL_MD5_PATH}]=${SOURCE_TARBALL_MD5_KEY} )