diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f01e48f1763..37035e48483 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -350,7 +350,7 @@ WORKSPACE.bazel @10gen/devprod-build @svc-auto-approve-bot /evergreen/generate_evergreen_bazelrc.sh @10gen/devprod-build @svc-auto-approve-bot /evergreen/get_custom_build_promotion_expansions.sh @10gen/devprod-release-infrastructure @svc-auto-approve-bot /evergreen/get_custom_build_promotion_expansions_debug.sh @10gen/devprod-release-infrastructure @svc-auto-approve-bot -/evergreen/upload_custom_build_to_cloud_dev.sh @10gen/devprod-release-infrastructure @svc-auto-approve-bot +/evergreen/upload_custom_build_to_cloud_env.sh @10gen/devprod-release-infrastructure @svc-auto-approve-bot /evergreen/package* @10gen/devprod-build @svc-auto-approve-bot /evergreen/validate_compile_commands.py @10gen/devprod-build @svc-auto-approve-bot /evergreen/packager_crypt_py_run.sh @10gen/devprod-build @svc-auto-approve-bot diff --git a/etc/evergreen_yml_components/tasks/compile_tasks.yml b/etc/evergreen_yml_components/tasks/compile_tasks.yml index 584556e4e2e..01406463a47 100644 --- a/etc/evergreen_yml_components/tasks/compile_tasks.yml +++ b/etc/evergreen_yml_components/tasks/compile_tasks.yml @@ -941,15 +941,16 @@ tasks: params: binary: bash env: - PROMOTE_TO_CLOUD_DEV: ${promote_to_cloud_dev} + PROMOTE_TO_CLOUD_ENV: ${promote_to_cloud_dev} + CLOUD_ENV: "cloud-dev" PROMOTE_BUILD_VARIANT: ${promote_build_variant} PROMOTE_MONGO_VERSION: ${version} PROMOTE_REVISION: ${promote_revision} PROMOTE_CDN_ADDRESS: ${promote_cdn_address} - CLOUD_DEV_API_PUBLIC_KEY: ${cloud_dev_api_public_key} - CLOUD_DEV_API_PRIVATE_KEY: ${cloud_dev_api_private_key} + CLOUD_ENV_API_PUBLIC_KEY: ${cloud_dev_api_public_key} + CLOUD_ENV_API_PRIVATE_KEY: ${cloud_dev_api_private_key} args: - - "./src/evergreen/upload_custom_build_to_cloud_dev.sh" + - "./src/evergreen/upload_custom_build_to_cloud_env.sh" - name: promote_sys_perf_build run_on: amazon2023-small @@ -1006,15 +1007,16 @@ tasks: params: binary: bash env: - PROMOTE_TO_CLOUD_DEV: ${promote_to_cloud_dev} + PROMOTE_TO_CLOUD_ENV: ${promote_to_cloud_dev} + CLOUD_ENV: "cloud-dev" PROMOTE_BUILD_VARIANT: ${promote_build_variant} PROMOTE_MONGO_VERSION: ${version} PROMOTE_REVISION: ${promote_revision} PROMOTE_CDN_ADDRESS: ${promote_cdn_address} - CLOUD_DEV_API_PUBLIC_KEY: ${cloud_dev_api_public_key} - CLOUD_DEV_API_PRIVATE_KEY: ${cloud_dev_api_private_key} + CLOUD_ENV_API_PUBLIC_KEY: ${cloud_dev_api_public_key} + CLOUD_ENV_API_PRIVATE_KEY: ${cloud_dev_api_private_key} args: - - "./src/evergreen/upload_custom_build_to_cloud_dev.sh" + - "./src/evergreen/upload_custom_build_to_cloud_env.sh" - name: crypt_push run_on: rhel8.7-small diff --git a/evergreen/OWNERS.yml b/evergreen/OWNERS.yml index 548f0ee5fc6..4256187b71b 100644 --- a/evergreen/OWNERS.yml +++ b/evergreen/OWNERS.yml @@ -24,7 +24,7 @@ filters: - "get_custom_build_promotion_expansions_debug.sh": approvers: - 10gen/devprod-release-infrastructure - - "upload_custom_build_to_cloud_dev.sh": + - "upload_custom_build_to_cloud_env.sh": approvers: - 10gen/devprod-release-infrastructure - "/package*": diff --git a/evergreen/upload_custom_build_to_cloud_dev.sh b/evergreen/upload_custom_build_to_cloud_env.sh similarity index 76% rename from evergreen/upload_custom_build_to_cloud_dev.sh rename to evergreen/upload_custom_build_to_cloud_env.sh index d2752101b34..381f6e630f5 100755 --- a/evergreen/upload_custom_build_to_cloud_dev.sh +++ b/evergreen/upload_custom_build_to_cloud_env.sh @@ -1,10 +1,14 @@ # see SERVER-107057 for information about this script -if [ "$PROMOTE_TO_CLOUD_DEV" = '' ]; then - echo "Skipping promotion to cloud-dev" +cloud_env="${CLOUD_ENV:-'cloud-dev'}" + +if [ "$PROMOTE_TO_CLOUD_ENV" = '' ]; then + echo "Skipping promotion to $cloud_env" exit 0 fi +echo "promoting build to environment '$cloud_env'" + case $PROMOTE_BUILD_VARIANT in *"arm64"* | *"aarch64"*) promote_arch="aarch64" @@ -13,7 +17,7 @@ case $PROMOTE_BUILD_VARIANT in promote_arch="amd64" ;; *) - echo "Could not parse architecture for build variant ${PROMOTE_BUILD_VARIANT} skipping promotion to cloud-dev" + echo "Could not parse architecture for build variant ${PROMOTE_BUILD_VARIANT} skipping promotion to cloud environment" exit 0 ;; esac @@ -21,7 +25,7 @@ esac case $PROMOTE_BUILD_VARIANT in *"amazon"*) ;; *) - echo "buildvariant ${PROMOTE_BUILD_VARIANT} doesn't appear to be an amazon buildvariant, skipping promotion to cloud-dev" + echo "buildvariant ${PROMOTE_BUILD_VARIANT} doesn't appear to be an amazon buildvariant, skipping promotion to cloud environment" exit 0 ;; esac @@ -36,7 +40,7 @@ case $PROMOTE_BUILD_VARIANT in promote_min_os_version="2" ;; *) - echo "Could not parse flavor for build variant ${PROMOTE_BUILD_VARIANT} skipping promotion to cloud-dev" + echo "Could not parse flavor for build variant ${PROMOTE_BUILD_VARIANT} skipping promotion to cloud environment" exit 0 ;; esac @@ -67,8 +71,8 @@ response=$(curl -sS --fail-with-body \ --digest \ --header "Content-Type: application/json" \ --data @body.json \ - -u "${CLOUD_DEV_API_PUBLIC_KEY}:${CLOUD_DEV_API_PRIVATE_KEY}" \ - https://cloud-dev.mongodb.com/api/private/nds/customMongoDbBuild) + -u "${CLOUD_ENV_API_PUBLIC_KEY}:${CLOUD_ENV_API_PRIVATE_KEY}" \ + "https://${cloud_env}.mongodb.com/api/private/nds/customMongoDbBuild") result=$?