diff --git a/etc/evergreen_timeouts.yml b/etc/evergreen_timeouts.yml index 80c8d46034b..ec500b32594 100644 --- a/etc/evergreen_timeouts.yml +++ b/etc/evergreen_timeouts.yml @@ -32,7 +32,7 @@ overrides: - task: ^change_stream_.*_fuzzer exec_timeout: 210 # 3.5 hours - enterprise-amazon2-streams: + enterprise-amazon2023-streams: - task: aggregation_blockprocessing_fuzzer exec_timeout: 600 # 10 hours diff --git a/etc/evergreen_yml_components/tasks/compile_tasks_nightly.yml b/etc/evergreen_yml_components/tasks/compile_tasks_nightly.yml index d61e005bb27..7b30408f820 100644 --- a/etc/evergreen_yml_components/tasks/compile_tasks_nightly.yml +++ b/etc/evergreen_yml_components/tasks/compile_tasks_nightly.yml @@ -756,21 +756,6 @@ tasks: - "src/mongodb-${push_name}-${push_arch}*" - "src/mongodb-cryptd-${push_name}-${push_arch}*" - - name: streams_publish_manifest_gen - tags: ["assigned_to_jira_team_streams", "auxiliary"] - depends_on: - - name: version_gen - variant: generate-tasks-for-version - # This is added because of EVG-18211. - # Without this we are adding extra dependencies on evergreen and it is causing strain - omit_generated_tasks: true - - name: streams_build_and_push_gen - variant: enterprise-amazon2-streams - - name: streams_build_and_push_gen - variant: enterprise-amazon2-streams-arm64 - commands: - - func: "streams publish manifest" - - name: streams_publish_manifest_al2023_gen tags: ["assigned_to_jira_team_streams", "auxiliary"] depends_on: diff --git a/etc/evergreen_yml_components/variants/amazon/test_release.yml b/etc/evergreen_yml_components/variants/amazon/test_release.yml index 76de6c70488..f376ddd0cf1 100644 --- a/etc/evergreen_yml_components/variants/amazon/test_release.yml +++ b/etc/evergreen_yml_components/variants/amazon/test_release.yml @@ -584,109 +584,6 @@ buildvariants: - name: streams_publish_manifest_al2023_gen - name: generate_buildid_to_debug_symbols_mapping - - name: enterprise-amazon2-streams - display_name: "Amazon Linux 2 enterprise build with streams" - cron: "0 3 * * *" # From the ${project_nightly_cron} parameter. - modules: ["asp-js-engine"] - run_on: - - amazon2-latest-small - expansions: - test_flags: >- - --excludeWithAnyTags=SERVER-34286,incompatible_with_amazon_linux,requires_external_data_source,requires_ldap_pool - --additionalFeatureFlags=featureFlagStreams - push_path: linux - push_bucket: downloads.10gen.com - push_bucket_new: cdn-origin-mongodb-server-enterprise - push_role_arn: arn:aws:iam::119629040606:role/s3-access.cdn-origin-mongodb-server-enterprise - push_name: linux - push_arch: x86_64-enterprise-amazon2-streams - bazel_compile_flags: >- - --define=MONGO_DISTMOD=amazon2 - --streams_release_build=True - multiversion_platform: amazon2 - multiversion_edition: enterprise-streams - has_packages: true - packager_script: packager_enterprise.py - packager_arch: x86_64 - packager_distro: amazon2 - repo_edition: enterprise - compile_variant: enterprise-amazon2-streams - large_distro_name: amazon2-latest-large - tasks: - - name: compile_and_archive_dist_test_TG - distros: - - amazon2-latest-large - - name: aggregation - - name: streams_gen - - name: streams_kafka_gen - - name: streams_kafka_gwproxy - - name: streams_kafka_benchmark - - name: streams_https - - name: streams_lambda - - name: streams_s3 - - name: streams_kinesis - - name: streams_aspio - - name: streams_aspio_iceberg_0 - - name: streams_aspio_iceberg_1 - - name: streams_aspio_iceberg_2 - - name: streams_aspio_iceberg_3 - - name: streams_aspio_iceberg_4 - - name: streams_build_and_push_gen - - name: generate_buildid_to_debug_symbols_mapping - - - name: enterprise-amazon2-streams-arm64 - display_name: "Amazon Linux 2 enterprise build with streams arm64" - cron: "0 3 * * *" # From the ${project_nightly_cron} parameter. - modules: ["asp-js-engine"] - run_on: - - amazon2-arm64-latest-m8g-xlarge - expansions: - test_flags: >- - --excludeWithAnyTags=SERVER-34286,incompatible_with_amazon_linux,requires_external_data_source,requires_ldap_pool - --additionalFeatureFlags=featureFlagStreams - push_path: linux - push_bucket: downloads.10gen.com - push_bucket_new: cdn-origin-mongodb-server-enterprise - push_role_arn: arn:aws:iam::119629040606:role/s3-access.cdn-origin-mongodb-server-enterprise - push_name: linux - push_arch: aarch64-enterprise-amazon2-streams - bazel_compile_flags: >- - --define=MONGO_DISTMOD=amazon2 - --streams_release_build=True - multiversion_platform: amazon2 - multiversion_edition: enterprise-streams - has_packages: true - packager_script: packager_enterprise.py - packager_arch: aarch64 - packager_distro: amazon2 - repo_edition: enterprise - compile_variant: enterprise-amazon2-streams-arm64 - large_distro_name: amazon2-arm64-latest-m8g-4xlarge - tasks: - - name: compile_and_archive_dist_test_TG - distros: - - amazon2-arm64-latest-m8g-4xlarge - - name: streams_gen - - name: streams_kafka_gen - # TODO(SERVER-103985) - Enabling this is blocked on SRE support arm64 in the sre/gwproxy image (SRE-1481) - # - name: streams_kafka_gwproxy - - name: aggregation - - name: streams_kafka_benchmark - - name: streams_https - - name: streams_lambda - - name: streams_s3 - - name: streams_kinesis - - name: streams_aspio - - name: streams_aspio_iceberg_0 - - name: streams_aspio_iceberg_1 - - name: streams_aspio_iceberg_2 - - name: streams_aspio_iceberg_3 - - name: streams_aspio_iceberg_4 - - name: streams_build_and_push_gen - # Only needed once to generate the streams manifest for both x86 and arm - - name: streams_publish_manifest_gen - - name: generate_buildid_to_debug_symbols_mapping - - &enterprise-amazon2023-arm64-fuzzers-template <<: *enterprise-amazon2023-arm64-template name: enterprise-amazon2023-arm64-fuzzers diff --git a/evergreen/package.sh b/evergreen/package.sh index fa503901514..d5cdfb794a8 100755 --- a/evergreen/package.sh +++ b/evergreen/package.sh @@ -13,8 +13,6 @@ valid_mongocryptd_variants=( "atlas-amazon2-arm64" "enterprise-amazon2" "enterprise-amazon2-arm64" - "enterprise-amazon2-streams" - "enterprise-amazon2-streams-arm64" "atlas-amazon2023" "atlas-amazon2023-arm64" "enterprise-amazon2023" diff --git a/evergreen/streams_image_build_and_push.sh b/evergreen/streams_image_build_and_push.sh index e45e51be4c0..34fe26a5de5 100644 --- a/evergreen/streams_image_build_and_push.sh +++ b/evergreen/streams_image_build_and_push.sh @@ -21,8 +21,8 @@ fi TAG_SUFFIX="$ARCH" -# Only these 2 distros are supported today -if [ "$DISTRO" != "amazon2" ] && [ "$DISTRO" != "amazon2023" ]; then +# Only amazon2023 distros are supported today +if [ "$DISTRO" != "amazon2023" ]; then echo "Unsupported distro: $DISTRO" >&2 exit 1 fi @@ -78,11 +78,7 @@ else echo "JS_ENGINE_PATH does not exist: $JS_ENGINE_PATH_ABS (skipping build arg)" fi -if [ "$DISTRO" == "amazon2" ]; then - docker build "${BUILD_ARGS[@]}" -t "$IMAGE" -f ./src/mongo/db/modules/enterprise/src/streams/build/Dockerfile . -else - docker build "${BUILD_ARGS[@]}" -t "$IMAGE" -f ./src/mongo/db/modules/enterprise/src/streams/build/Dockerfile.al2023 . -fi +docker build "${BUILD_ARGS[@]}" -t "$IMAGE" -f ./src/mongo/db/modules/enterprise/src/streams/build/Dockerfile.al2023 . docker tag "$IMAGE" "$IMAGE:$GITSHA-$TAG_SUFFIX"