Merge v1.20 into v1.x (#1471)

mongodb · Sep 30, 2024 · 0527fa4 · 0527fa4
2 parents cb33c1c + 7047c72
commit 0527fa4
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 100 deletions.
diff --git 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/lowest.yml b/.evergreen/config/generated/test-variant/lowest.yml
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/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
@@ -40,36 +40,22 @@
       - ".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
       - ".standalone .local !.csfle !.6.0 !.7.0 !.8.0 !.rapid !.latest"
       - ".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"