diff options
author | sergey.galtsev <sergey.galtsev@mongodb.com> | 2022-05-26 16:53:05 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-05-26 18:35:40 +0000 |
commit | 18fd7f814bd9d020b917c427a879839cec16c24c (patch) | |
tree | 669119038c516bd39339d47402c2fa0c0d4a3a62 | |
parent | b4500cec1ccf1f080fed6687fa5611db0002275d (diff) | |
download | mongo-18fd7f814bd9d020b917c427a879839cec16c24c.tar.gz |
SERVER-66771 Rename CSFLE build artifacts
-rw-r--r-- | etc/evergreen.yml | 30 | ||||
-rw-r--r-- | etc/evergreen_yml_components/definitions.yml | 126 | ||||
-rw-r--r-- | etc/evergreen_yml_components/variants/atlas.yml | 6 | ||||
-rw-r--r-- | etc/evergreen_yml_components/variants/ibm.yml | 18 | ||||
-rw-r--r-- | etc/evergreen_yml_components/variants/misc_release.yml | 88 | ||||
-rwxr-xr-x | evergreen/crypt_run_tests.sh | 83 | ||||
-rwxr-xr-x | evergreen/csfle_run_tests.sh | 83 | ||||
-rw-r--r-- | evergreen/notary_client_crypt_run.sh (renamed from evergreen/notary_client_csfle_run.sh) | 4 |
8 files changed, 219 insertions, 219 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 9c6ce890f8c..3dcd227d6cb 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -98,7 +98,7 @@ variables: - name: auth_audit_gen - name: buildscripts_test - name: causally_consistent_jscore_txns_passthrough - - name: .csfle + - name: .crypt distros: - windows-vsCurrent-xlarge - name: .encrypt !.aggregation !.gcm @@ -132,7 +132,7 @@ variables: push_name: linux push_arch: x86_64-enterprise-rhel70 compile_flags: --ssl MONGO_DISTMOD=rhel70 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars - csfle_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" + crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" multiversion_platform: rhel70 multiversion_edition: enterprise has_packages: true @@ -184,8 +184,8 @@ variables: - name: sharding_auth_gen - name: snmp - name: .stitch - - name: .csfle - - name: .publish_csfle + - name: .crypt + - name: .publish_crypt - name: unittest_shell_hang_analyzer_gen - name: test_packages distros: @@ -926,7 +926,7 @@ buildvariants: - name: causally_consistent_jscore_txns_passthrough distros: - windows-vsCurrent-large - - name: .csfle + - name: .crypt distros: - windows-vsCurrent-large - name: .encrypt !.aggregation !.replica_sets !.sharding !.jscore @@ -998,7 +998,7 @@ buildvariants: - name: causally_consistent_jscore_txns_passthrough distros: - windows-vsCurrent-large - - name: .csfle + - name: .crypt distros: - windows-vsCurrent-xlarge - name: .encrypt !.aggregation !.replica_sets !.sharding !.jscore @@ -1207,7 +1207,7 @@ buildvariants: # - name: replica_sets_auth_gen - name: replica_sets_jscore_passthrough_gen - name: sasl - - name: .csfle + - name: .crypt - name: enterprise-macos-cxx20 display_name: "Enterprise macOS C++20 DEBUG" @@ -1234,7 +1234,7 @@ buildvariants: - name: replica_sets_auth_gen - name: replica_sets_jscore_passthrough_gen - name: sasl - - name: .csfle + - name: .crypt - name: enterprise-macos-arm64 display_name: "~ Enterprise macOS arm64" @@ -1264,8 +1264,8 @@ buildvariants: - name: push distros: - rhel70-small - - name: .csfle - - name: .publish_csfle + - name: .crypt + - name: .publish_crypt distros: - rhel70-small @@ -1337,7 +1337,7 @@ buildvariants: expansions: &enterprise-rhel-80-64-bit-dynamic-required-expansions additional_package_targets: archive-mongocryptd archive-mongocryptd-debug archive-mh archive-mh-debug compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --link-model=dynamic - csfle_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" + crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" multiversion_platform: rhel80 multiversion_edition: enterprise has_packages: false @@ -1454,10 +1454,10 @@ buildvariants: - name: sharding_opportunistic_secondary_targeting_gen - name: snmp - name: .stitch - - name: .csfle + - name: .crypt distros: - rhel80-xlarge - - name: csfle_build_debug_and_test + - name: crypt_build_debug_and_test distros: - rhel80-xlarge - name: .updatefuzzer @@ -1501,7 +1501,7 @@ buildvariants: expansions: &enterprise-rhel-80-64-bit-dynamic-all-feature-flags-expansions additional_package_targets: archive-mongocryptd archive-mongocryptd-debug archive-mh archive-mh-debug compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars --link-model=dynamic - csfle_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" + crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" multiversion_platform: rhel80 multiversion_edition: enterprise has_packages: false @@ -1603,7 +1603,7 @@ buildvariants: - name: sharded_multi_stmt_txn_jscore_passthrough - name: snmp - name: .stitch - - name: .csfle + - name: .crypt distros: - rhel80-xlarge - name: .serverless diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml index 5b5cc15e50b..1ba40536a5c 100644 --- a/etc/evergreen_yml_components/definitions.yml +++ b/etc/evergreen_yml_components/definitions.yml @@ -2755,13 +2755,13 @@ tasks: args: - "src/evergreen/stitch_support_run_tests.sh" -- name: csfle_create_lib +- name: crypt_create_lib tags: [] commands: - *f_expansions_write - func: "scons compile" vars: - targets: archive-mongo-csfle-dev + targets: archive-mongo-crypt-dev task_compile_flags: >- --allocator=system --enable-free-mon=off @@ -2770,31 +2770,31 @@ tasks: --link-model=dynamic-sdk --enable-http-client=off --ssl=off - ${csfle_task_compile_flags} - DESTDIR='$BUILD_ROOT/csfle-lib-$MONGO_VERSION' + ${crypt_task_compile_flags} + DESTDIR='$BUILD_ROOT/crypt-lib-$MONGO_VERSION' - command: subprocess.exec params: binary: bash args: - - "src/evergreen/csfle_run_tests.sh" + - "src/evergreen/crypt_run_tests.sh" - command: s3.put params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: "src/mongo-csfle-dev.${ext|tgz}" - remote_file: "${project}/mongo_csfle/${build_variant}/${revision}/mongo_csfle_v1-${version}.${ext|tgz}" + local_file: "src/mongo-crypt-dev.${ext|tgz}" + remote_file: "${project}/mongo_crypt/${build_variant}/${revision}/mongo_crypt_v1-${version}.${ext|tgz}" bucket: mciuploads permissions: public-read content_type: ${content_type|application/tar} - display_name: "Mongo CSFLE Library" + display_name: "Mongo crypt Library" -- name: csfle_create_debug_lib +- name: crypt_create_debug_lib tags: [] commands: - *f_expansions_write - func: "scons compile" vars: - targets: archive-mongo-csfle-dev archive-mongo-csfle-debug + targets: archive-mongo-crypt-dev archive-mongo-crypt-debug task_compile_flags: >- --dbg=on --opt=off @@ -2803,37 +2803,37 @@ tasks: --enterprise-features=fle --js-engine=none --link-model=dynamic-sdk - DESTDIR='$BUILD_ROOT/csfle-lib-$MONGO_VERSION' + DESTDIR='$BUILD_ROOT/crypt-lib-$MONGO_VERSION' - command: s3.put params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: "src/mongo-csfle-dev.${ext|tgz}" - remote_file: "${project}/mongo_csfle/${build_variant}/${revision}/mongo_csfle_v1_dev-${version}.${ext|tgz}" + local_file: "src/mongo-crypt-dev.${ext|tgz}" + remote_file: "${project}/mongo_crypt/${build_variant}/${revision}/mongo_crypt_v1_dev-${version}.${ext|tgz}" bucket: mciuploads permissions: public-read content_type: ${content_type|application/tar} - display_name: "Mongo CSFLE Library dev" + display_name: "Mongo Crypt Library dev" - command: s3.put params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: "src/mongo-csfle-debug.${ext|tgz}" - remote_file: "${project}/mongo_csfle/${build_variant}/${revision}/mongo_csfle_v1_debug-${version}.${ext|tgz}" + local_file: "src/mongo-crypt-debug.${ext|tgz}" + remote_file: "${project}/mongo_crypt/${build_variant}/${revision}/mongo_crypt_v1_debug-${version}.${ext|tgz}" bucket: mciuploads permissions: public-read content_type: ${content_type|application/tar} - display_name: "Mongo CSFLE Library debug" + display_name: "Mongo Crypt Library debug" -- name: csfle_install_tests +- name: crypt_install_tests tags: [] depends_on: - - name: csfle_create_debug_lib + - name: crypt_create_debug_lib commands: - *f_expansions_write - func: "scons compile" vars: - targets: archive-mongo-csfle-shlib-test + targets: archive-mongo-crypt-shlib-test compiling_for_test: true task_install_action: default @@ -2843,22 +2843,22 @@ tasks: --enterprise-features=fle --js-engine=none --link-model=static - DESTDIR='$BUILD_ROOT/csfle-lib-$MONGO_VERSION' + DESTDIR='$BUILD_ROOT/crypt-lib-$MONGO_VERSION' - command: s3.put params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: "src/mongo-csfle-shlib-test-runtime.${ext|tgz}" - remote_file: "${project}/mongo_csfle/${build_variant}/${revision}/mongo_csfle_shlib_test-${version}.${ext|tgz}" + local_file: "src/mongo-crypt-shlib-test-runtime.${ext|tgz}" + remote_file: "${project}/mongo_crypt/${build_variant}/${revision}/mongo_crypt_shlib_test-${version}.${ext|tgz}" bucket: mciuploads permissions: public-read content_type: ${content_type|application/tar} - display_name: "Mongo CSFLE Shared Library Test" + display_name: "Mongo Crypt Shared Library Test" -- name: csfle_run_tests +- name: crypt_run_tests tags: [] depends_on: - - name: csfle_install_tests + - name: crypt_install_tests commands: - *f_expansions_write - command: subprocess.exec @@ -2866,7 +2866,7 @@ tasks: params: binary: bash args: - - "src/evergreen/csfle_run_tests.sh" + - "src/evergreen/crypt_run_tests.sh" - name: compile_benchmarks tags: [] @@ -6979,12 +6979,12 @@ tasks: - {'source': {'path': '${push_path}-STAGE/${push_name}/mongodb-${push_name}-${push_arch}-debugsymbols-${suffix}-${task_id}.${ext|tgz}.md5', 'bucket': 'build-push-testing'}, 'destination': {'path': '${push_path}/mongodb-${push_name}-${push_arch}-debugsymbols-${suffix}.${ext|tgz}.md5', 'bucket': '${push_bucket}'}} -- name: csfle_push - tags: ["publish_csfle"] +- name: crypt_push + tags: ["publish_crypt"] patchable: false stepback: false depends_on: - - name: csfle_create_lib + - name: crypt_create_lib commands: - command: manifest.load - func: "f_expansions_write" @@ -7004,9 +7004,9 @@ tasks: params: aws_key: ${aws_key} aws_secret: ${aws_secret} - remote_file: ${project}/mongo_csfle/${build_variant}/${revision}/mongo_csfle_v1-${version}.${ext|tgz} + remote_file: ${project}/mongo_crypt/${build_variant}/${revision}/mongo_crypt_v1-${version}.${ext|tgz} bucket: mciuploads - local_file: src/mongo_csfle_v1.${ext|tgz} + local_file: src/mongo_crypt_v1.${ext|tgz} - func: "generate compile expansions" - func: "apply compile expansions" - func: "set up remote credentials" @@ -7020,74 +7020,74 @@ tasks: params: binary: bash args: - - "./src/evergreen/notary_client_csfle_run.sh" - # Put the csfle tarball/zipfile + - "./src/evergreen/notary_client_crypt_run.sh" + # Put the crypt tarball/zipfile - command: s3.put params: aws_secret: ${aws_secret} - local_file: src/mongo_csfle_v1-${push_name}-${push_arch}-${suffix}.${ext|tgz} + local_file: src/mongo_crypt_v1-${push_name}-${push_arch}-${suffix}.${ext|tgz} aws_key: ${aws_key} bucket: build-push-testing permissions: public-read content_type: ${content_type|application/gzip} - remote_file: ${push_path}-STAGE/${push_name}/mongo_csfle_v1-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz} - # Put the csfle tarball signature + remote_file: ${push_path}-STAGE/${push_name}/mongo_crypt_v1-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz} + # Put the crypt tarball signature - command: s3.put params: aws_secret: ${aws_secret} - local_file: src/mongo_csfle_v1-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sig + local_file: src/mongo_crypt_v1-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sig aws_key: ${aws_key} bucket: build-push-testing permissions: public-read content_type: ${content_type|application/gzip} - remote_file: ${push_path}-STAGE/${push_name}/mongo_csfle_v1-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}.sig - # Put the csfle tarball sha1 + remote_file: ${push_path}-STAGE/${push_name}/mongo_crypt_v1-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}.sig + # Put the crypt tarball sha1 - command: s3.put params: aws_secret: ${aws_secret} - local_file: src/mongo_csfle_v1-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha1 + local_file: src/mongo_crypt_v1-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha1 aws_key: ${aws_key} permissions: public-read bucket: build-push-testing content_type: text/plain - remote_file: ${push_path}-STAGE/${push_name}/mongo_csfle_v1-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}.sha1 - # Put the csfle tarball sha256 + remote_file: ${push_path}-STAGE/${push_name}/mongo_crypt_v1-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}.sha1 + # Put the crypt tarball sha256 - command: s3.put params: aws_secret: ${aws_secret} - local_file: src/mongo_csfle_v1-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha256 + local_file: src/mongo_crypt_v1-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha256 permissions: public-read aws_key: ${aws_key} bucket: build-push-testing content_type: text/plain - remote_file: ${push_path}-STAGE/${push_name}/mongo_csfle_v1-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}.sha256 - # Put the csfle tarball md5 + remote_file: ${push_path}-STAGE/${push_name}/mongo_crypt_v1-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}.sha256 + # Put the crypt tarball md5 - command: s3.put params: aws_secret: ${aws_secret} - local_file: src/mongo_csfle_v1-${push_name}-${push_arch}-${suffix}.${ext|tgz}.md5 + local_file: src/mongo_crypt_v1-${push_name}-${push_arch}-${suffix}.${ext|tgz}.md5 aws_key: ${aws_key} bucket: build-push-testing permissions: public-read content_type: text/plain - remote_file: ${push_path}-STAGE/${push_name}/mongo_csfle_v1-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}.md5 + remote_file: ${push_path}-STAGE/${push_name}/mongo_crypt_v1-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}.md5 - command: s3Copy.copy params: aws_key: ${aws_key} aws_secret: ${aws_secret} s3_copy_files: #Binaries - - {'source': {'path': '${push_path}-STAGE/${push_name}/mongo_csfle_v1-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}', 'bucket': 'build-push-testing'}, - 'destination': {'path': '${push_path}/mongo_csfle_v1-${push_name}-${push_arch}-${suffix}.${ext|tgz}', 'bucket': '${push_bucket}'}} + - {'source': {'path': '${push_path}-STAGE/${push_name}/mongo_crypt_v1-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}', 'bucket': 'build-push-testing'}, + 'destination': {'path': '${push_path}/mongo_crypt_v1-${push_name}-${push_arch}-${suffix}.${ext|tgz}', 'bucket': '${push_bucket}'}} #SHA1 for binaries - - {'source': {'path': '${push_path}-STAGE/${push_name}/mongo_csfle_v1-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}.sha1', 'bucket': 'build-push-testing'}, - 'destination': {'path': '${push_path}/mongo_csfle_v1-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha1', 'bucket': '${push_bucket}'}} + - {'source': {'path': '${push_path}-STAGE/${push_name}/mongo_crypt_v1-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}.sha1', 'bucket': 'build-push-testing'}, + 'destination': {'path': '${push_path}/mongo_crypt_v1-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha1', 'bucket': '${push_bucket}'}} #SHA256 for binaries - - {'source': {'path': '${push_path}-STAGE/${push_name}/mongo_csfle_v1-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}.sha256', 'bucket': 'build-push-testing'}, - 'destination': {'path': '${push_path}/mongo_csfle_v1-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha256', 'bucket': '${push_bucket}'}} + - {'source': {'path': '${push_path}-STAGE/${push_name}/mongo_crypt_v1-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}.sha256', 'bucket': 'build-push-testing'}, + 'destination': {'path': '${push_path}/mongo_crypt_v1-${push_name}-${push_arch}-${suffix}.${ext|tgz}.sha256', 'bucket': '${push_bucket}'}} #MD5 for binaries - - {'source': {'path': '${push_path}-STAGE/${push_name}/mongo_csfle_v1-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}.md5', 'bucket': 'build-push-testing'}, - 'destination': {'path': '${push_path}/mongo_csfle_v1-${push_name}-${push_arch}-${suffix}.${ext|tgz}.md5', 'bucket': '${push_bucket}'}} + - {'source': {'path': '${push_path}-STAGE/${push_name}/mongo_crypt_v1-${push_name}-${push_arch}-${suffix}-${task_id}.${ext|tgz}.md5', 'bucket': 'build-push-testing'}, + 'destination': {'path': '${push_path}/mongo_crypt_v1-${push_name}-${push_arch}-${suffix}.${ext|tgz}.md5', 'bucket': '${push_bucket}'}} - <<: *task_template name: search @@ -7534,7 +7534,7 @@ task_groups: - "stitch_support_install_tests" - "stitch_support_run_tests" -- name: csfle_build +- name: crypt_build setup_task: - func: "f_expansions_write" - func: "apply compile expansions" @@ -7559,12 +7559,12 @@ task_groups: - func: "generate compile expansions" teardown_group: - func: "umount shared scons directory" - tags: ["csfle"] + tags: ["crypt"] max_hosts: 1 tasks: - - "csfle_create_lib" + - "crypt_create_lib" -- name: csfle_build_debug_and_test +- name: crypt_build_debug_and_test setup_task: - func: "f_expansions_write" - func: "apply compile expansions" @@ -7591,6 +7591,6 @@ task_groups: - func: "umount shared scons directory" max_hosts: 1 tasks: - - "csfle_create_debug_lib" - - "csfle_install_tests" - - "csfle_run_tests" + - "crypt_create_debug_lib" + - "crypt_install_tests" + - "crypt_run_tests" diff --git a/etc/evergreen_yml_components/variants/atlas.yml b/etc/evergreen_yml_components/variants/atlas.yml index adf3c2d7760..982aca93761 100644 --- a/etc/evergreen_yml_components/variants/atlas.yml +++ b/etc/evergreen_yml_components/variants/atlas.yml @@ -15,7 +15,7 @@ buildvariants: push_name: linux push_arch: x86_64-enterprise-rhel70 compile_flags: --ssl MONGO_DISTMOD=rhel70 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars - csfle_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" + crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" multiversion_platform: rhel70 multiversion_edition: enterprise has_packages: true @@ -67,8 +67,8 @@ buildvariants: - name: sharding_auth_gen - name: snmp - name: .stitch - - name: .csfle - - name: .publish_csfle + - name: .crypt + - name: .publish_crypt - name: unittest_shell_hang_analyzer_gen - name: test_packages distros: diff --git a/etc/evergreen_yml_components/variants/ibm.yml b/etc/evergreen_yml_components/variants/ibm.yml index 88ef898955d..e31896a58ce 100644 --- a/etc/evergreen_yml_components/variants/ibm.yml +++ b/etc/evergreen_yml_components/variants/ibm.yml @@ -13,7 +13,7 @@ buildvariants: additional_package_targets: archive-mongocryptd archive-mongocryptd-debug # We need to compensate for SMT8 setting the cpu count very high and lower the amount of parallelism down compile_flags: --ssl MONGO_DISTMOD=rhel81 -j$(echo "$(grep -c processor /proc/cpuinfo)/2" | bc) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars - csfle_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" + crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" resmoke_jobs_factor: 0.25 has_packages: true packager_script: packager_enterprise.py @@ -48,8 +48,8 @@ buildvariants: - name: .sharding .common !.multiversion - name: snmp - name: .stitch - - name: .csfle - - name: .publish_csfle + - name: .crypt + - name: .publish_crypt distros: - rhel70-small - name: .publish @@ -69,7 +69,7 @@ buildvariants: additional_package_targets: archive-mongocryptd archive-mongocryptd-debug release_buid: true compile_flags: --ssl MONGO_DISTMOD=rhel72 -j3 --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars - csfle_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" + crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" resmoke_jobs_max: 2 has_packages: true packager_script: packager_enterprise.py @@ -104,8 +104,8 @@ buildvariants: - name: .sharding .common !.multiversion - name: snmp - name: .stitch - - name: .csfle - - name: .publish_csfle + - name: .crypt + - name: .publish_crypt distros: - rhel70-small - name: .publish @@ -125,7 +125,7 @@ buildvariants: additional_package_targets: archive-mongocryptd archive-mongocryptd-debug release_buid: true compile_flags: --ssl MONGO_DISTMOD=rhel83 -j3 --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars - csfle_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" + crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" resmoke_jobs_max: 2 has_packages: true packager_script: packager_enterprise.py @@ -160,8 +160,8 @@ buildvariants: - name: .sharding .common !.multiversion - name: snmp - name: .stitch - - name: .csfle - - name: .publish_csfle + - name: .crypt + - name: .publish_crypt distros: - rhel80-small - name: .publish diff --git a/etc/evergreen_yml_components/variants/misc_release.yml b/etc/evergreen_yml_components/variants/misc_release.yml index 8f3ed095b45..229112855cb 100644 --- a/etc/evergreen_yml_components/variants/misc_release.yml +++ b/etc/evergreen_yml_components/variants/misc_release.yml @@ -67,7 +67,7 @@ buildvariants: push_name: linux push_arch: x86_64-enterprise-amzn64 compile_flags: --ssl MONGO_DISTMOD=amzn64 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars - csfle_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" + crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" test_flags: --excludeWithAnyTags=incompatible_with_amazon_linux multiversion_platform: amzn64 multiversion_edition: enterprise @@ -103,7 +103,7 @@ buildvariants: - name: slow1_gen - name: snmp - name: .stitch - - name: .csfle + - name: .crypt - name: test_packages distros: - ubuntu2004-package @@ -181,7 +181,7 @@ buildvariants: push_name: linux push_arch: x86_64-enterprise-amazon2 compile_flags: --ssl MONGO_DISTMOD=amazon2 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars - csfle_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" + crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" multiversion_platform: amazon2 multiversion_edition: enterprise has_packages: true @@ -214,8 +214,8 @@ buildvariants: - name: slow1_gen - name: snmp - name: .stitch - - name: .csfle - - name: .publish_csfle + - name: .crypt + - name: .publish_crypt - name: test_packages distros: - ubuntu2004-package @@ -288,7 +288,7 @@ buildvariants: push_name: linux push_arch: aarch64-enterprise-amazon2 compile_flags: --ssl MONGO_DISTMOD=amazon2 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars - csfle_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" + crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" # TODO BUILD-13887 should fix uses_pykmip incompatibility. test_flags: --excludeWithAnyTags=incompatible_with_amazon_linux,requires_ldap_pool,uses_pykmip has_packages: true @@ -371,10 +371,10 @@ buildvariants: - name: .sharding .common - name: snmp - name: .stitch - - name: .csfle + - name: .crypt distros: - amazon2-arm64-large - - name: .publish_csfle + - name: .publish_crypt distros: - amazon2-arm64-large - name: secondary_reads_passthrough_gen @@ -461,7 +461,7 @@ buildvariants: push_name: linux push_arch: x86_64-enterprise-debian10 compile_flags: --ssl MONGO_DISTMOD=debian10 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars - csfle_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" + crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" multiversion_platform: linux_x86_64 multiversion_edition: base multiversion_platform_42_or_later: debian10 @@ -493,8 +493,8 @@ buildvariants: - name: sharding_auth_gen - name: snmp - name: .stitch - - name: .csfle - - name: .publish_csfle + - name: .crypt + - name: .publish_crypt - name: test_packages distros: - ubuntu2004-package @@ -571,7 +571,7 @@ buildvariants: push_name: linux push_arch: x86_64-enterprise-debian11 compile_flags: --ssl MONGO_DISTMOD=debian11 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars - csfle_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" + crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" multiversion_platform: linux_x86_64 multiversion_edition: base multiversion_platform_42_or_later: debian11 @@ -603,8 +603,8 @@ buildvariants: - name: sharding_auth_gen - name: snmp - name: .stitch - - name: .csfle - - name: .publish_csfle + - name: .crypt + - name: .publish_crypt - name: test_packages distros: - ubuntu2004-package @@ -769,7 +769,7 @@ buildvariants: push_name: linux push_arch: x86_64-enterprise-rhel80 compile_flags: --ssl MONGO_DISTMOD=rhel80 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars - csfle_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" + crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" multiversion_platform: rhel80 multiversion_edition: enterprise has_packages: true @@ -852,10 +852,10 @@ buildvariants: - name: .sharding .common - name: snmp - name: .stitch - - name: .csfle + - name: .crypt distros: - rhel80-large - - name: .publish_csfle + - name: .publish_crypt - name: .updatefuzzer - name: secondary_reads_passthrough_gen - name: server_discovery_and_monitoring_json_test_TG @@ -934,7 +934,7 @@ buildvariants: push_name: linux push_arch: aarch64-enterprise-rhel82 compile_flags: --ssl MONGO_DISTMOD=rhel82 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars - csfle_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" + crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" has_packages: true packager_script: packager_enterprise.py packager_arch: aarch64 @@ -968,10 +968,10 @@ buildvariants: - name: sharding_auth_gen - name: snmp - name: .stitch - - name: .csfle + - name: .crypt distros: - rhel82-arm64-large - - name: .publish_csfle + - name: .publish_crypt - name: test_packages distros: - ubuntu2004-package @@ -1045,7 +1045,7 @@ buildvariants: push_name: linux push_arch: x86_64-enterprise-suse12 compile_flags: --ssl MONGO_DISTMOD=suse12 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars - csfle_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" + crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" multiversion_platform: suse12 multiversion_edition: enterprise has_packages: true @@ -1071,8 +1071,8 @@ buildvariants: - name: sharding_auth_gen - name: snmp - name: .stitch - - name: .csfle - - name: .publish_csfle + - name: .crypt + - name: .publish_crypt - name: test_packages distros: - ubuntu2004-package @@ -1095,7 +1095,7 @@ buildvariants: push_name: linux push_arch: x86_64-enterprise-suse15 compile_flags: --ssl MONGO_DISTMOD=suse15 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars - csfle_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" + crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" has_packages: true packager_script: packager_enterprise.py packager_arch: x86_64 @@ -1119,8 +1119,8 @@ buildvariants: - name: sharding_auth_gen - name: snmp - name: .stitch - - name: .csfle - - name: .publish_csfle + - name: .crypt + - name: .publish_crypt - name: .publish distros: - suse15-small @@ -1250,7 +1250,7 @@ buildvariants: push_name: linux push_arch: x86_64-enterprise-ubuntu1804 compile_flags: --ssl --ocsp-stapling=off MONGO_DISTMOD=ubuntu1804 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars - csfle_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" + crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" multiversion_platform: ubuntu1804 multiversion_edition: enterprise test_flags: --excludeWithAnyTags=requires_ocsp_stapling @@ -1271,8 +1271,8 @@ buildvariants: - name: libdeps_graph_linting_TG distros: - ubuntu1804-build - - name: .csfle - - name: .publish_csfle + - name: .crypt + - name: .publish_crypt - name: .aggfuzzer .common - name: audit - name: causally_consistent_jscore_txns_passthrough @@ -1319,7 +1319,7 @@ buildvariants: push_name: linux push_arch: aarch64-enterprise-ubuntu1804 compile_flags: --ssl --ocsp-stapling=off MONGO_DISTMOD=ubuntu1804 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars - csfle_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" + crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" test_flags: --excludeWithAnyTags=requires_ocsp_stapling resmoke_jobs_max: 4 # Avoid starting too many mongod's on ARM test servers has_packages: true @@ -1352,8 +1352,8 @@ buildvariants: - name: sharding_jscore_passthrough - name: .ssl - name: .stitch - - name: .csfle - - name: .publish_csfle + - name: .crypt + - name: .publish_crypt distros: - ubuntu1804-test - name: test_packages @@ -1467,7 +1467,7 @@ buildvariants: push_name: linux push_arch: x86_64-enterprise-ubuntu2004 compile_flags: --ssl MONGO_DISTMOD=ubuntu2004 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars - csfle_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" + crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" multiversion_platform: ubuntu2004 multiversion_edition: enterprise has_packages: true @@ -1481,8 +1481,8 @@ buildvariants: - name: compile_test_and_package_serial_TG distros: - ubuntu2004-large - - name: .csfle - - name: .publish_csfle + - name: .crypt + - name: .publish_crypt - name: .aggfuzzer .common !.multiversion - name: audit - name: causally_consistent_jscore_txns_passthrough @@ -1522,7 +1522,7 @@ buildvariants: push_name: linux push_arch: aarch64-enterprise-ubuntu2004 compile_flags: --ssl MONGO_DISTMOD=ubuntu2004 -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_v3_gcc.vars - csfle_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" + crypt_task_compile_flags: SHLINKFLAGS_EXTRA="-Wl,-Bsymbolic -Wl,--no-gnu-unique" CCFLAGS="-fno-gnu-unique" resmoke_jobs_max: 4 # Avoid starting too many mongod's on ARM test servers has_packages: true packager_script: packager_enterprise.py @@ -1554,8 +1554,8 @@ buildvariants: - name: sharding_jscore_passthrough - name: .ssl - name: .stitch - - name: .csfle - - name: .publish_csfle + - name: .crypt + - name: .publish_crypt - name: test_packages distros: - ubuntu2004-package @@ -1702,10 +1702,10 @@ buildvariants: distros: - windows-vsCurrent-large - name: .concurrency .common - - name: .csfle + - name: .crypt distros: - windows-vsCurrent-large - - name: .publish_csfle + - name: .publish_crypt distros: - rhel70-small - name: disk_wiredtiger @@ -1868,8 +1868,8 @@ buildvariants: - name: push distros: - rhel70-small - - name: .csfle - - name: .publish_csfle + - name: .crypt + - name: .publish_crypt distros: - rhel70-small @@ -1907,7 +1907,7 @@ buildvariants: - name: push distros: - rhel70-small - - name: .csfle - - name: .publish_csfle + - name: .crypt + - name: .publish_crypt distros: - rhel70-small diff --git a/evergreen/crypt_run_tests.sh b/evergreen/crypt_run_tests.sh new file mode 100755 index 00000000000..6a20341c27e --- /dev/null +++ b/evergreen/crypt_run_tests.sh @@ -0,0 +1,83 @@ +#!/bin/bash + +# This script verifies that specific symbols, and specific symbols only are +# exported in mongo_crypt_v1.so + +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" +. "$DIR/prelude.sh" + +cd src + +set -o errexit +set -o verbose + +if [ "$(uname)" != "Linux" ]; then + echo "Skipping test, this is for linux only" + exit 0 +fi + +EXTRACT_DIR="build/crypt-lib-${version}" +SOPATH="${EXTRACT_DIR}/lib/mongo_crypt_v1.so" +UNITTEST_PATH="${EXTRACT_DIR}/bin/mongo_crypt_shlib_test" +GDB_PATH="/opt/mongodbtoolchain/v3/bin/gdb" + +# dump the contents of the extract dir to log +find $EXTRACT_DIR + +if [ ! -f "$SOPATH" ]; then + echo "Error: can not find library at: $SOPATH" + exit 1 +fi + +# +# Check the set of exported symbols match the expected set of symbols +# +echo "Running Mongo Crypt Shared Library exported symbols test" + +expect='A MONGO_CRYPT_1.0 +T mongo_crypt_v1_analyze_query +T mongo_crypt_v1_bson_free +T mongo_crypt_v1_get_version +T mongo_crypt_v1_get_version_str +T mongo_crypt_v1_lib_create +T mongo_crypt_v1_lib_destroy +T mongo_crypt_v1_query_analyzer_create +T mongo_crypt_v1_query_analyzer_destroy +T mongo_crypt_v1_status_create +T mongo_crypt_v1_status_destroy +T mongo_crypt_v1_status_get_code +T mongo_crypt_v1_status_get_error +T mongo_crypt_v1_status_get_explanation' + +actual="$(nm --extern-only --defined-only "$SOPATH" | awk '{ print $2, $3 }' | sort)" + +if [ "$actual" != "$expect" ]; then + echo "Error: symbols are not as expected in: $SOPATH" + echo "Diff:" + diff <(echo "$actual") <(echo "$expect") + exit 1 +fi + +echo "Mongo Crypt Shared Library exported symbols test succeeded!" + +# +# If the shared library version of the unit tests exists, run it, +# and the verify it can be debugged with gdb +# +if [ ! -f "$UNITTEST_PATH" ]; then + echo "Skipping Mongo Crypt Shared Library unit test. Test not found at $UNITTEST_PATH" + exit 0 +fi + +echo "Running Mongo Crypt Shared Library unit test" +$UNITTEST_PATH +echo "Mongo Crypt Shared Library unit test succeeded!" + +if [ ! -f "$GDB_PATH" ]; then + echo "Skipping Mongo Crypt Shared Library debuggability test. No gdb found at $GDB_PATH" + exit 0 +fi + +echo "Running Mongo Crypt Shared Library debuggability test" +$GDB_PATH "$UNITTEST_PATH" --batch -ex "source ${EXTRACT_DIR}/crypt_debuggability_test.py" +echo "Mongo Crypt Shared Library shared library debuggability test succeeded!" diff --git a/evergreen/csfle_run_tests.sh b/evergreen/csfle_run_tests.sh deleted file mode 100755 index b4639a5c3c5..00000000000 --- a/evergreen/csfle_run_tests.sh +++ /dev/null @@ -1,83 +0,0 @@ -#!/bin/bash - -# This script verifies that specific symbols, and specific symbols only are -# exported in mongo_csfle_v1.so - -DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" > /dev/null 2>&1 && pwd)" -. "$DIR/prelude.sh" - -cd src - -set -o errexit -set -o verbose - -if [ "$(uname)" != "Linux" ]; then - echo "Skipping test, this is for linux only" - exit 0 -fi - -EXTRACT_DIR="build/csfle-lib-${version}" -SOPATH="${EXTRACT_DIR}/lib/mongo_csfle_v1.so" -UNITTEST_PATH="${EXTRACT_DIR}/bin/mongo_csfle_shlib_test" -GDB_PATH="/opt/mongodbtoolchain/v3/bin/gdb" - -# dump the contents of the extract dir to log -find $EXTRACT_DIR - -if [ ! -f "$SOPATH" ]; then - echo "Error: can not find library at: $SOPATH" - exit 1 -fi - -# -# Check the set of exported symbols match the expected set of symbols -# -echo "Running CSFLE exported symbols test" - -expect='A MONGO_CSFLE_1.0 -T mongo_csfle_v1_analyze_query -T mongo_csfle_v1_bson_free -T mongo_csfle_v1_get_version -T mongo_csfle_v1_get_version_str -T mongo_csfle_v1_lib_create -T mongo_csfle_v1_lib_destroy -T mongo_csfle_v1_query_analyzer_create -T mongo_csfle_v1_query_analyzer_destroy -T mongo_csfle_v1_status_create -T mongo_csfle_v1_status_destroy -T mongo_csfle_v1_status_get_code -T mongo_csfle_v1_status_get_error -T mongo_csfle_v1_status_get_explanation' - -actual="$(nm --extern-only --defined-only "$SOPATH" | awk '{ print $2, $3 }' | sort)" - -if [ "$actual" != "$expect" ]; then - echo "Error: symbols are not as expected in: $SOPATH" - echo "Diff:" - diff <(echo "$actual") <(echo "$expect") - exit 1 -fi - -echo "CSFLE exported symbols test succeeded!" - -# -# If the shared library version of the unit tests exists, run it, -# and the verify it can be debugged with gdb -# -if [ ! -f "$UNITTEST_PATH" ]; then - echo "Skipping CSFLE shared library unit test. Test not found at $UNITTEST_PATH" - exit 0 -fi - -echo "Running CSFLE shared library unit test" -$UNITTEST_PATH -echo "CSFLE shared library unit test succeeded!" - -if [ ! -f "$GDB_PATH" ]; then - echo "Skipping CSFLE debuggability test. No gdb found at $GDB_PATH" - exit 0 -fi - -echo "Running CSFLE shared library debuggability test" -$GDB_PATH "$UNITTEST_PATH" --batch -ex "source ${EXTRACT_DIR}/csfle_debuggability_test.py" -echo "CSFLE shared library debuggability test succeeded!" diff --git a/evergreen/notary_client_csfle_run.sh b/evergreen/notary_client_crypt_run.sh index caa8305c604..6e4cd2221d1 100644 --- a/evergreen/notary_client_csfle_run.sh +++ b/evergreen/notary_client_crypt_run.sh @@ -10,11 +10,11 @@ set -o verbose ext="${ext:-tgz}" -mv "mongo_csfle_v1.$ext" mongo_csfle_v1-${push_name}-${push_arch}-${suffix}.${ext} +mv "mongo_crypt_v1.$ext" mongo_crypt_v1-${push_name}-${push_arch}-${suffix}.${ext} /usr/local/bin/notary-client.py \ --key-name "server-6.0" \ --auth-token-file ${workdir}/src/signing_auth_token \ --comment "Evergreen Automatic Signing ${revision} - ${build_variant} - ${branch_name}" \ --notary-url http://notary-service.build.10gen.cc:5000 \ - mongo_csfle_v1-${push_name}-${push_arch}-${suffix}.${ext} + mongo_crypt_v1-${push_name}-${push_arch}-${suffix}.${ext} |