diff --git a/.evergreen/config/build-variants.yml b/.evergreen/config/build-variants.yml index 2635e81a6..26eaec881 100644 --- a/.evergreen/config/build-variants.yml +++ b/.evergreen/config/build-variants.yml @@ -15,18 +15,6 @@ buildvariants: run_on: debian11-small tasks: - name: "build-all-php" - - name: build-debian10 - display_name: "Build: Debian 10" - tags: ["build", "debian", "x64", "pr", "tag"] - run_on: debian10-small - tasks: - - name: "build-all-php" - - name: build-debian92 - display_name: "Build: Debian 9.2" - tags: ["build", "debian", "x64", "pr", "tag"] - run_on: debian92-small - tasks: - - name: "build-all-php" # RHEL - name: build-rhel90 diff --git a/.evergreen/config/generated/test-variant/legacy-php-full.yml b/.evergreen/config/generated/test-variant/legacy-php-full.yml index b63271633..3328665af 100644 --- a/.evergreen/config/generated/test-variant/legacy-php-full.yml +++ b/.evergreen/config/generated/test-variant/legacy-php-full.yml @@ -23,16 +23,16 @@ buildvariants: - "test-atlas-data-lake" # Test versions < 5.0 - - name: test-debian92-php-8.0-local - tags: ["test", "debian", "x64", "php8.0", "pr", "tag"] - display_name: "Test: Debian 9.2, PHP 8.0" - run_on: debian92-small + - name: test-rhel80-php-8.0 + tags: ["test", "rhel", "x64", "php8.0", "pr", "tag"] + display_name: "Test: RHEL 8.0, PHP 8.0" + run_on: rhel80-small expansions: - FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_VARIANT: "build-rhel80" FETCH_BUILD_TASK: "build-php-8.0" PHP_VERSION: "8.0" depends_on: - - variant: "build-debian92" + - variant: "build-rhel80" name: "build-php-8.0" tasks: # Remember to add new major versions here as they are released @@ -40,20 +40,6 @@ buildvariants: - ".replicaset .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".sharded .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".loadbalanced .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - - # Test Atlas and CSFLE on RHEL 8 - - name: test-rhel80-php-8.0-atlas - tags: ["test", "debian", "x64", "php8.0", "pr", "tag"] - display_name: "Test: RHEL 8.0, PHP 8.0" - run_on: rhel80-small - expansions: - FETCH_BUILD_VARIANT: "build-rhel80" - FETCH_BUILD_TASK: "build-php-8.0" - PHP_VERSION: "8.0" - depends_on: - - variant: "build-rhel80" - name: "build-php-8.0" - tasks: - "test_atlas_task_group" - ".csfle" # TODO PHPLIB-955: This file can be removed when requiring PHP 8.1+ @@ -79,16 +65,16 @@ buildvariants: - "test-atlas-data-lake" # Test versions < 5.0 - - name: test-debian92-php-7.4-local - tags: ["test", "debian", "x64", "php7.4", "pr", "tag"] - display_name: "Test: Debian 9.2, PHP 7.4" - run_on: debian92-small + - name: test-rhel80-php-7.4 + tags: ["test", "rhel", "x64", "php7.4", "pr", "tag"] + display_name: "Test: RHEL 8.0, PHP 7.4" + run_on: rhel80-small expansions: - FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_VARIANT: "build-rhel80" FETCH_BUILD_TASK: "build-php-7.4" PHP_VERSION: "7.4" depends_on: - - variant: "build-debian92" + - variant: "build-rhel80" name: "build-php-7.4" tasks: # Remember to add new major versions here as they are released @@ -96,19 +82,5 @@ buildvariants: - ".replicaset .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".sharded .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".loadbalanced .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - - # Test Atlas and CSFLE on RHEL 8 - - name: test-rhel80-php-7.4-atlas - tags: ["test", "debian", "x64", "php7.4", "pr", "tag"] - display_name: "Test: RHEL 8.0, PHP 7.4" - run_on: rhel80-small - expansions: - FETCH_BUILD_VARIANT: "build-rhel80" - FETCH_BUILD_TASK: "build-php-7.4" - PHP_VERSION: "7.4" - depends_on: - - variant: "build-rhel80" - name: "build-php-7.4" - tasks: - "test_atlas_task_group" - ".csfle" diff --git a/.evergreen/config/generated/test-variant/lowest.yml b/.evergreen/config/generated/test-variant/lowest.yml index 6ed188430..842a937e3 100644 --- a/.evergreen/config/generated/test-variant/lowest.yml +++ b/.evergreen/config/generated/test-variant/lowest.yml @@ -1,16 +1,16 @@ # This file is generated automatically - please edit the "templates/test-variant/lowest.yml" template file instead. buildvariants: - - name: test-debian92-php-7.4-local-lowest - tags: ["test", "debian", "x64", "php7.4", "pr", "tag"] - display_name: "Test: Debian 9.2, PHP 7.4, Lowest Dependencies" - run_on: debian92-small + - name: test-rhel80-php-7.4-local-lowest + tags: ["test", "rhel", "x64", "php7.4", "pr", "tag"] + display_name: "Test: RHEL 8.0, PHP 7.4, Lowest Dependencies" + run_on: rhel80-small expansions: - FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_VARIANT: "build-rhel80" FETCH_BUILD_TASK: "build-php-7.4-lowest" PHP_VERSION: "7.4" DEPENDENCIES: "lowest" depends_on: - - variant: "build-debian92" + - variant: "build-rhel80" name: "build-php-7.4-lowest" tasks: - ".replicaset .local .4.0 !.csfle" diff --git a/.evergreen/config/generated/test-variant/modern-php-full.yml b/.evergreen/config/generated/test-variant/modern-php-full.yml index 7c3fb7877..37845f33e 100644 --- a/.evergreen/config/generated/test-variant/modern-php-full.yml +++ b/.evergreen/config/generated/test-variant/modern-php-full.yml @@ -42,16 +42,16 @@ buildvariants: - ".loadbalanced .local !.csfle !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" # Test versions < 5.0 - - name: test-debian92-php-8.3-local + - name: test-rhel80-php-8.3 tags: ["test", "debian", "x64", "php8.3", "pr", "tag"] - display_name: "Test: Debian 9.2, PHP 8.3" - run_on: debian92-small + display_name: "Test: RHEL 8.0, PHP 8.3" + run_on: rhel80-small expansions: - FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_VARIANT: "build-rhel80" FETCH_BUILD_TASK: "build-php-8.3" PHP_VERSION: "8.3" depends_on: - - variant: "build-debian92" + - variant: "build-rhel80" name: "build-php-8.3" tasks: # Remember to add new major versions here as they are released @@ -59,20 +59,6 @@ buildvariants: - ".replicaset .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".sharded .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".loadbalanced .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - - # Test Atlas and CSFLE on RHEL 8 - - name: test-rhel80-php-8.3-atlas - tags: ["test", "debian", "x64", "php8.3", "pr", "tag"] - display_name: "Test: RHEL 8.0, PHP 8.3" - run_on: rhel80-small - expansions: - FETCH_BUILD_VARIANT: "build-rhel80" - FETCH_BUILD_TASK: "build-php-8.3" - PHP_VERSION: "8.3" - depends_on: - - variant: "build-rhel80" - name: "build-php-8.3" - tasks: - "test_atlas_task_group" - ".csfle" # Test MongoDB >= 7.0 @@ -117,16 +103,16 @@ buildvariants: - ".loadbalanced .local !.csfle !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" # Test versions < 5.0 - - name: test-debian92-php-8.2-local + - name: test-rhel80-php-8.2 tags: ["test", "debian", "x64", "php8.2", "pr", "tag"] - display_name: "Test: Debian 9.2, PHP 8.2" - run_on: debian92-small + display_name: "Test: RHEL 8.0, PHP 8.2" + run_on: rhel80-small expansions: - FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_VARIANT: "build-rhel80" FETCH_BUILD_TASK: "build-php-8.2" PHP_VERSION: "8.2" depends_on: - - variant: "build-debian92" + - variant: "build-rhel80" name: "build-php-8.2" tasks: # Remember to add new major versions here as they are released @@ -134,20 +120,6 @@ buildvariants: - ".replicaset .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".sharded .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".loadbalanced .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - - # Test Atlas and CSFLE on RHEL 8 - - name: test-rhel80-php-8.2-atlas - tags: ["test", "debian", "x64", "php8.2", "pr", "tag"] - display_name: "Test: RHEL 8.0, PHP 8.2" - run_on: rhel80-small - expansions: - FETCH_BUILD_VARIANT: "build-rhel80" - FETCH_BUILD_TASK: "build-php-8.2" - PHP_VERSION: "8.2" - depends_on: - - variant: "build-rhel80" - name: "build-php-8.2" - tasks: - "test_atlas_task_group" - ".csfle" # Test MongoDB >= 7.0 @@ -192,16 +164,16 @@ buildvariants: - ".loadbalanced .local !.csfle !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" # Test versions < 5.0 - - name: test-debian92-php-8.1-local + - name: test-rhel80-php-8.1 tags: ["test", "debian", "x64", "php8.1", "pr", "tag"] - display_name: "Test: Debian 9.2, PHP 8.1" - run_on: debian92-small + display_name: "Test: RHEL 8.0, PHP 8.1" + run_on: rhel80-small expansions: - FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_VARIANT: "build-rhel80" FETCH_BUILD_TASK: "build-php-8.1" PHP_VERSION: "8.1" depends_on: - - variant: "build-debian92" + - variant: "build-rhel80" name: "build-php-8.1" tasks: # Remember to add new major versions here as they are released @@ -209,19 +181,5 @@ buildvariants: - ".replicaset .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".sharded .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".loadbalanced .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - - # Test Atlas and CSFLE on RHEL 8 - - name: test-rhel80-php-8.1-atlas - tags: ["test", "debian", "x64", "php8.1", "pr", "tag"] - display_name: "Test: RHEL 8.0, PHP 8.1" - run_on: rhel80-small - expansions: - FETCH_BUILD_VARIANT: "build-rhel80" - FETCH_BUILD_TASK: "build-php-8.1" - PHP_VERSION: "8.1" - depends_on: - - variant: "build-rhel80" - name: "build-php-8.1" - tasks: - "test_atlas_task_group" - ".csfle" diff --git a/.evergreen/config/templates/test-variant/legacy-php-full.yml b/.evergreen/config/templates/test-variant/legacy-php-full.yml index 82bef9b4b..ba199dc4b 100644 --- a/.evergreen/config/templates/test-variant/legacy-php-full.yml +++ b/.evergreen/config/templates/test-variant/legacy-php-full.yml @@ -21,16 +21,16 @@ - "test-atlas-data-lake" # Test versions < 5.0 - - name: test-debian92-php-%phpVersion%-local - tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"] - display_name: "Test: Debian 9.2, PHP %phpVersion%" - run_on: debian92-small + - name: test-rhel80-php-%phpVersion% + tags: ["test", "rhel", "x64", "php%phpVersion%", "pr", "tag"] + display_name: "Test: RHEL 8.0, PHP %phpVersion%" + run_on: rhel80-small expansions: - FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_VARIANT: "build-rhel80" FETCH_BUILD_TASK: "build-php-%phpVersion%" PHP_VERSION: "%phpVersion%" depends_on: - - variant: "build-debian92" + - variant: "build-rhel80" name: "build-php-%phpVersion%" tasks: # Remember to add new major versions here as they are released @@ -38,19 +38,5 @@ - ".replicaset .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".sharded .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".loadbalanced .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - - # Test Atlas and CSFLE on RHEL 8 - - name: test-rhel80-php-%phpVersion%-atlas - tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"] - display_name: "Test: RHEL 8.0, PHP %phpVersion%" - run_on: rhel80-small - expansions: - FETCH_BUILD_VARIANT: "build-rhel80" - FETCH_BUILD_TASK: "build-php-%phpVersion%" - PHP_VERSION: "%phpVersion%" - depends_on: - - variant: "build-rhel80" - name: "build-php-%phpVersion%" - tasks: - "test_atlas_task_group" - ".csfle" diff --git a/.evergreen/config/templates/test-variant/lowest.yml b/.evergreen/config/templates/test-variant/lowest.yml index 3237c71e8..ff416a287 100644 --- a/.evergreen/config/templates/test-variant/lowest.yml +++ b/.evergreen/config/templates/test-variant/lowest.yml @@ -1,14 +1,14 @@ - - name: test-debian92-php-%phpVersion%-local-lowest - tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"] - display_name: "Test: Debian 9.2, PHP %phpVersion%, Lowest Dependencies" - run_on: debian92-small + - name: test-rhel80-php-%phpVersion%-local-lowest + tags: ["test", "rhel", "x64", "php%phpVersion%", "pr", "tag"] + display_name: "Test: RHEL 8.0, PHP %phpVersion%, Lowest Dependencies" + run_on: rhel80-small expansions: - FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_VARIANT: "build-rhel80" FETCH_BUILD_TASK: "build-php-%phpVersion%-lowest" PHP_VERSION: "%phpVersion%" DEPENDENCIES: "lowest" depends_on: - - variant: "build-debian92" + - variant: "build-rhel80" name: "build-php-%phpVersion%-lowest" tasks: - ".replicaset .local .4.0 !.csfle" diff --git a/.evergreen/config/templates/test-variant/modern-php-full.yml b/.evergreen/config/templates/test-variant/modern-php-full.yml index f22163a37..21468390d 100644 --- a/.evergreen/config/templates/test-variant/modern-php-full.yml +++ b/.evergreen/config/templates/test-variant/modern-php-full.yml @@ -40,16 +40,16 @@ - ".loadbalanced .local !.csfle !.4.0 !.4.2 !.4.4 !.7.0 !.8.0 !.rapid !.latest" # Test versions < 5.0 - - name: test-debian92-php-%phpVersion%-local + - name: test-rhel80-php-%phpVersion% tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"] - display_name: "Test: Debian 9.2, PHP %phpVersion%" - run_on: debian92-small + display_name: "Test: RHEL 8.0, PHP %phpVersion%" + run_on: rhel80-small expansions: - FETCH_BUILD_VARIANT: "build-debian92" + FETCH_BUILD_VARIANT: "build-rhel80" FETCH_BUILD_TASK: "build-php-%phpVersion%" PHP_VERSION: "%phpVersion%" depends_on: - - variant: "build-debian92" + - variant: "build-rhel80" name: "build-php-%phpVersion%" tasks: # Remember to add new major versions here as they are released @@ -57,19 +57,5 @@ - ".replicaset .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".sharded .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - ".loadbalanced .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest" - - # Test Atlas and CSFLE on RHEL 8 - - name: test-rhel80-php-%phpVersion%-atlas - tags: ["test", "debian", "x64", "php%phpVersion%", "pr", "tag"] - display_name: "Test: RHEL 8.0, PHP %phpVersion%" - run_on: rhel80-small - expansions: - FETCH_BUILD_VARIANT: "build-rhel80" - FETCH_BUILD_TASK: "build-php-%phpVersion%" - PHP_VERSION: "%phpVersion%" - depends_on: - - variant: "build-rhel80" - name: "build-php-%phpVersion%" - tasks: - "test_atlas_task_group" - ".csfle"