Merge v1.x into v2.x (#1704)

mongodb · Sep 30, 2024 · a55485f · a55485f
2 parents 0e08a44 + d9c5af6
commit a55485f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 36 deletions.
diff --git a/.evergreen/config/build-variants.yml b/.evergreen/config/build-variants.yml
@@ -16,18 +16,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/php-full.yml b/.evergreen/config/generated/test-variant/php-full.yml
diff --git a/.evergreen/config/templates/test-variant/php-full.yml b/.evergreen/config/templates/test-variant/php-full.yml
@@ -57,15 +57,15 @@
           - ".ocsp .5.0"
 
   # Test versions < 5.0
-  - name: test-debian92-php-%phpVersion%
-    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-rhel8"
       FETCH_BUILD_TASK: "build-php-%phpVersion%"
     depends_on:
-      - variant: "build-debian92"
+      - variant: "build-rhel8"
         name: "build-php-%phpVersion%"
     tasks:
       # Remember to add new major versions here as they are released