Merge v1.21 into v2.1 (#1779)

mongodb-php-bot · web-flow · commit 1d94eb1c5bd2 · 2025-09-22T15:03:24.000+02:00
diff --git a/.evergreen/config/functions.yml b/.evergreen/config/functions.yml
@@ -207,19 +207,6 @@ functions:
           TESTS=${TESTS} \
           bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
 
-  "run atlas data lake test":
-    - command: shell.exec
-      type: test
-      params:
-        working_dir: "src"
-        script: |
-          ${PREPARE_SHELL}
-          export PATH="${PHP_PATH}/bin:$PATH"
-          
-          MONGODB_URI="mongodb://mhuser:pencil@127.0.0.1:27017" \
-          TESTS="atlas-data-lake" \
-          bash ${PROJECT_DIRECTORY}/.evergreen/run-tests.sh
-
   "cleanup":
     - command: shell.exec
       params:
diff --git a/.evergreen/config/generated/test-variant/modern-php-full.yml b/.evergreen/config/generated/test-variant/modern-php-full.yml
diff --git a/.evergreen/config/generated/test-variant/phpc.yml b/.evergreen/config/generated/test-variant/phpc.yml
diff --git a/.evergreen/config/templates/test-variant/modern-php-full.yml b/.evergreen/config/templates/test-variant/modern-php-full.yml
@@ -16,7 +16,6 @@
       - ".replicaset .local !.csfle !.4.2 !.4.4 !.5.0 !.6.0"
       - ".sharded .local !.csfle !.4.2 !.4.4 !.5.0 !.6.0"
       - ".loadbalanced .local !.csfle !.4.2 !.4.4 !.5.0 !.6.0"
-      - "test-atlas-data-lake"
 
   # Test MongoDB 5.0 and 6.0
   - name: test-debian11-php-%phpVersion%-local
diff --git a/.evergreen/config/templates/test-variant/phpc.yml b/.evergreen/config/templates/test-variant/phpc.yml
@@ -33,4 +33,3 @@
       - ".replicaset .local !.csfle !.4.2 !.4.4 !.5.0 !.6.0"
       - ".sharded .local !.csfle !.4.2 !.4.4 !.5.0 !.6.0"
       - ".loadbalanced .local !.csfle !.4.2 !.4.4 !.5.0 !.6.0"
-      - "test-atlas-data-lake"
diff --git a/.evergreen/config/test-tasks.yml b/.evergreen/config/test-tasks.yml
@@ -7,14 +7,6 @@ tasks:
         vars:
           TESTS: "atlas"
 
-  - name: "test-atlas-data-lake"
-    commands:
-      - command: ec2.assume_role
-        params:
-          role_arn: ${aws_test_secrets_role}
-      - func: "bootstrap mongohoused"
-      - func: "run atlas data lake test"
-
   - name: "run-benchmark"
     exec_timeout_secs: 3600
     commands:
diff --git a/.evergreen/config/test-variants.yml b/.evergreen/config/test-variants.yml
@@ -13,18 +13,3 @@ buildvariants:
         name: "build-php-8.2"
     tasks:
       - "run-benchmark"
-
-  # Run Atlas Data Lake Tests on Ubuntu
-  - name: test-ubuntu2204-php82-local
-    tags: ["test", "ubuntu", "x64"]
-    display_name: "Test: Ubuntu 22.04 x64, PHP 8.2"
-    run_on: ubuntu2204-small
-    expansions:
-      FETCH_BUILD_VARIANT: "build-ubuntu2204"
-      FETCH_BUILD_TASK: "build-php-8.2"
-      PHP_VERSION: "8.2"
-    depends_on:
-      - variant: "build-ubuntu2204"
-        name: "build-php-8.2"
-    tasks:
-      - "test-atlas-data-lake"
diff --git a/.evergreen/run-tests.sh b/.evergreen/run-tests.sh
@@ -86,10 +86,6 @@ case "$TESTS" in
       php vendor/bin/phpunit $PHPUNIT_OPTS --group atlas
       ;;
 
-   atlas-data-lake)
-      php vendor/bin/phpunit $PHPUNIT_OPTS --group atlas-data-lake
-      ;;
-
    csfle)
       php vendor/bin/phpunit $PHPUNIT_OPTS --group csfle
       ;;
diff --git a/tests/FunctionalTestCase.php b/tests/FunctionalTestCase.php
@@ -504,16 +504,6 @@ protected function skipIfTransactionsAreNotSupported(): void
         }
     }
 
-    protected function isAtlasDataLake(): bool
-    {
-        $buildInfo = $this->getPrimaryServer()->executeCommand(
-            $this->getDatabaseName(),
-            new Command(['buildInfo' => 1]),
-        )->toArray()[0];
-
-        return ! empty($buildInfo->dataLake);
-    }
-
     protected function isEnterprise(): bool
     {
         $buildInfo = $this->getPrimaryServer()->executeCommand(
diff --git a/tests/SpecTests/AtlasDataLakeSpecTest.php b/tests/SpecTests/AtlasDataLakeSpecTest.php
diff --git a/tests/UnifiedSpecTests/UnifiedSpecTest.php b/tests/UnifiedSpecTests/UnifiedSpecTest.php
@@ -113,22 +113,6 @@ public function setUp(): void
         }
     }
 
-    #[DataProvider('provideAtlasDataLakeTests')]
-    #[Group('atlas-data-lake')]
-    public function testAtlasDataLake(UnifiedTestCase $test): void
-    {
-        if (! $this->isAtlasDataLake()) {
-            $this->markTestSkipped('Server is not Atlas Data Lake');
-        }
-
-        self::$runner->run($test);
-    }
-
-    public static function provideAtlasDataLakeTests(): Generator
-    {
-        return self::provideTests('atlas-data-lake-testing/tests/unified', 'atlas-data-lake');
-    }
-
     #[DataProvider('provideChangeStreamsTests')]
     public function testChangeStreams(UnifiedTestCase $test): void
     {

Original file line number	Diff line number	Diff line change
`@@ -504,16 +504,6 @@ protected function skipIfTransactionsAreNotSupported(): void`
`504`	`504`	`}`
`505`	`505`	`}`
`506`	`506`
`507`		`- protected function isAtlasDataLake(): bool`
`508`		`- {`
`509`		`- $buildInfo = $this->getPrimaryServer()->executeCommand(`
`510`		`- $this->getDatabaseName(),`
`511`		`- new Command(['buildInfo' => 1]),`
`512`		`- )->toArray()[0];`
`513`		`-`
`514`		`- return ! empty($buildInfo->dataLake);`
`515`		`- }`
`516`		`-`
`517`	`507`	`protected function isEnterprise(): bool`
`518`	`508`	`{`
`519`	`509`	`$buildInfo = $this->getPrimaryServer()->executeCommand(`