From 14bcef04af8ea17b3ff964d7ada31f0e926449d1 Mon Sep 17 00:00:00 2001 From: Sean Lyons Date: Fri, 15 May 2026 09:57:20 -0400 Subject: [PATCH] SERVER-126753: Use the same Evergreen configuration for all release branches (#53778) GitOrigin-RevId: bd316ca715d8501bf1d07578925473f577478ba4 --- .../yaml_configuration/buildvariants.md | 53 +++---------------- etc/evergreen.yml | 7 +-- etc/evergreen_nightly.yml | 25 ++++----- 3 files changed, 18 insertions(+), 67 deletions(-) diff --git a/docs/evergreen-testing/yaml_configuration/buildvariants.md b/docs/evergreen-testing/yaml_configuration/buildvariants.md index 7b672da14f9..a957f9c67d6 100644 --- a/docs/evergreen-testing/yaml_configuration/buildvariants.md +++ b/docs/evergreen-testing/yaml_configuration/buildvariants.md @@ -47,50 +47,9 @@ tasks tagged as `experimental` to run. This tag is used in conjunction with the In each of platform or build variant group directory there can be these files: -- `test_dev.yml` - - - these files are merged into `etc/evergreen.yml` which is used for `mongodb-mongo-master` project - on master branch - - after branching on all new branches these files are merged into `etc/evergreen_nightly.yml` - which is used for a new branch `mongodb-mongo-vX.Y` project - -- `test_dev_master_and_lts_branches_only.yml` - - - these files are merged into `etc/evergreen.yml` which is used for `mongodb-mongo-master` project - on master branch - - after branching for LTS release (v7.0, v8.0 etc.) on a new branch these files are merged into - `etc/evergreen_nightly.yml` which is used for a new branch `mongodb-mongo-vX.Y` project - - **important**: all tests that are running on these build variants will NOT run on a new Rapid - release (v7.1, v7.2, v7.3, v8.1, v8.2, v8.3 etc.) branch projects - -- `test_dev_master_branch_only.yml` - - - these files are merged into `etc/evergreen.yml` which is used for `mongodb-mongo-master` project - on master branch - - after branching on all new branches these files are NOT used - - **important**: all tests that are running on these build variants will NOT run on a new branch - `mongodb-mongo-vX.Y` project - -- `test_release.yml` - - - these files are merged into `etc/evergreen_nightly.yml` which is used for - `mongodb-mongo-master-nightly` project on master branch - - after branching on all new branches these files are merged into `etc/evergreen_nightly.yml` - which is used for a new branch `mongodb-mongo-vX.Y` project - -- `test_release_master_and_lts_branches_only.yml` - - - these files are merged into `etc/evergreen_nightly.yml` which is used for - `mongodb-mongo-master-nightly` project on master branch - - after branching for LTS release (v7.0, v8.0 etc.) on a new branch these files are merged into - `etc/evergreen_nightly.yml` which is used for a new branch `mongodb-mongo-vX.Y` project - - **important**: all tests that are running on these build variants will NOT run on a new Rapid - release (v7.1, v7.2, v7.3, v8.1, v8.2, v8.3 etc.) branch projects - -- `test_release_master_branch_only.yml` - - - these files are merged into `etc/evergreen_nightly.yml` which is used for - `mongodb-mongo-master-nightly` project on master branch - - after branching on all new branches these files are NOT used - - **important**: all tests that are running on these build variants will NOT run on a new branch - `mongodb-mongo-vX.Y` project +| YAML file | Runs on | Master project and Evergreen YML | Release project and Evergreen YML | +| ------------------------------------- | ----------------- | ---------------------------------------------------- | ------------------------------------------ | +| `test_dev.yml` | master + releases | mongodb-mongo-master `evergreen.yml` | mongodb-mongo-vX.Y `evergreen_nightly.yml` | +| `test_dev_master_branch_only.yml` | master only | mongodb-mongo-master `evergreen.yml` | not used | +| `test_release.yml` | master + releases | mongodb-mongo-master-nightly `evergreen_nightly.yml` | mongodb-mongo-vX.Y `evergreen_nightly.yml` | +| `test_release_master_branch_only.yml` | master only | mongodb-mongo-master-nightly `evergreen_nightly.yml` | commented out | diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 5cb1e885f0e..97569a934ce 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -77,22 +77,19 @@ include: - filename: etc/evergreen_yml_components/variants/mongot/test_dev.yml - filename: etc/evergreen_yml_components/variants/rhel/test_dev.yml - - filename: etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml - filename: etc/evergreen_yml_components/variants/rhel/test_dev_master_branch_only.yml - filename: etc/evergreen_yml_components/variants/sanitizer/test_dev.yml - filename: etc/evergreen_yml_components/variants/sanitizer/test_dev_master_branch_only.yml - - filename: etc/evergreen_yml_components/variants/ubuntu/test_dev_master_and_lts_branches_only.yml - - filename: etc/evergreen_yml_components/variants/ubuntu/test_dev_master_branch_only.yml + - filename: etc/evergreen_yml_components/variants/ubuntu/test_dev.yml - filename: etc/evergreen_yml_components/variants/windows/test_dev.yml - - filename: etc/evergreen_yml_components/variants/windows/test_dev_master_and_lts_branches_only.yml - filename: etc/evergreen_yml_components/variants/windows/test_dev_master_branch_only.yml - filename: etc/evergreen_yml_components/variants/wiredtiger/test_dev_master_branch_only.yml - - filename: etc/evergreen_yml_components/variants/codecoverage/test_dev.yml + - filename: etc/evergreen_yml_components/variants/codecoverage/test_dev_master_branch_only.yml - filename: etc/evergreen_yml_components/variants/amazon/streams/streams_dev.yml diff --git a/etc/evergreen_nightly.yml b/etc/evergreen_nightly.yml index 236edca5133..4970636d4a6 100644 --- a/etc/evergreen_nightly.yml +++ b/etc/evergreen_nightly.yml @@ -15,48 +15,43 @@ include: - filename: etc/evergreen_yml_components/tasks/misc_tasks.yml - filename: etc/evergreen_yml_components/variants/misc/task_generation.yml - ### Uncomment when using this file for a LTS or Rapid release branch. ### + ### Uncomment when using this file for a release branch. ### # - filename: etc/evergreen_yml_components/variants/misc/misc.yml - filename: etc/evergreen_yml_components/variants/amazon/test_release.yml - ### Uncomment when using this file for a LTS or Rapid release branch. ### + ### Uncomment when using this file for a release branch. ### # - filename: etc/evergreen_yml_components/variants/amazon/test_dev.yml - filename: etc/evergreen_yml_components/variants/debian/test_release.yml - ### Comment out when using this file for a Rapid release branch. ### - - filename: etc/evergreen_yml_components/variants/ibm/test_release_master_and_lts_branches_only.yml + - filename: etc/evergreen_yml_components/variants/ibm/test_release.yml - filename: etc/evergreen_yml_components/variants/macos/test_release.yml - filename: etc/evergreen_yml_components/variants/rhel/test_release.yml - ### Uncomment when using this file for a LTS or Rapid release branch. ### + ### Uncomment when using this file for a release branch. ### # - filename: etc/evergreen_yml_components/variants/rhel/test_dev.yml - ### Uncomment when using this file for a LTS release branch. ### - # - filename: etc/evergreen_yml_components/variants/rhel/test_dev_master_and_lts_branches_only.yml - ### Uncomment when using this file for a LTS or Rapid release branch. ### + ### Uncomment when using this file for a release branch. ### # - filename: etc/evergreen_yml_components/variants/sanitizer/test_dev.yml - ### Uncomment when using this file for a LTS or Rapid release branch. ### + ### Uncomment when using this file for a release branch. ### # - filename: etc/evergreen_yml_components/variants/mongot/test_dev.yml - filename: etc/evergreen_yml_components/variants/suse/test_release.yml - filename: etc/evergreen_yml_components/variants/ubuntu/test_release.yml - ### Uncomment when using this file for a LTS release branch. ### - # - filename: etc/evergreen_yml_components/variants/ubuntu/test_dev_master_and_lts_branches_only.yml + ### Uncomment when using this file for a release branch. ### + # - filename: etc/evergreen_yml_components/variants/ubuntu/test_dev.yml - filename: etc/evergreen_yml_components/variants/windows/test_release.yml - ### Uncomment when using this file for a LTS or Rapid release branch. ### + ### Uncomment when using this file for a release branch. ### # - filename: etc/evergreen_yml_components/variants/windows/test_dev.yml - ### Uncomment when using this file for a LTS release branch. ### - # - filename: etc/evergreen_yml_components/variants/windows/test_dev_master_and_lts_branches_only.yml - filename: etc/evergreen_yml_components/tasks/coverity_tasks.yml - filename: etc/evergreen_yml_components/variants/coverity.yml - filename: etc/evergreen_yml_components/tasks/release_tasks.yml - ### Uncomment when using this file for a LTS or Rapid release branch. ### + ### Uncomment when using this file for a release branch. ### # - filename: etc/evergreen_yml_components/variants/release/release.yml - filename: src/mongo/db/modules/atlas/atlas_release.yml