MOTOR-1140 Switch to using RHEL only for tests (mongodb#212)

Jibola · Jun 13, 2023 · 6b7d0e9 · 6b7d0e9
1 parent 2c0570f
commit 6b7d0e9
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 19 deletions.
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -829,7 +829,7 @@ axes:
            AUTH: "noauth"
 
   - id: tox-env
-    display_name: "Tox Env"
+    display_name: "Tox Env RHEL8"
     values:
       - id: "tornado5-pypy37"
         variables:
@@ -859,6 +859,10 @@ axes:
         variables:
            TOX_ENV: "tornado6-py310"
            PYTHON_BINARY: "/opt/python/3.10/bin/python3"
+      - id: "tornado6-py311"
+        variables:
+           TOX_ENV: "tornado6-py311"
+           PYTHON_BINARY: "/opt/python/3.11/bin/python3"
       - id: "tornado_git-py38"
         variables:
            TOX_ENV: "tornado_git-py38"
@@ -883,6 +887,10 @@ axes:
         variables:
            TOX_ENV: "asyncio-py310"
            PYTHON_BINARY: "/opt/python/3.10/bin/python3"
+      - id: "asyncio-py311"
+        variables:
+           TOX_ENV: "asyncio-py311"
+           PYTHON_BINARY: "/opt/python/3.11/bin/python3"
       - id: "py3-pymongo-latest"
         variables:
            TOX_ENV: "py3-pymongo-latest"
@@ -892,17 +900,17 @@ axes:
           TOX_ENV: "synchro37"
           PYTHON_BINARY: "/opt/python/3.7/bin/python3"
 
-  - id: tox-env-ubuntu
-    display_name: "Tox Env Ubuntu"
+  - id: tox-env-rhel7
+    display_name: "Tox Env RHEL7"
     values:
-      - id: "tornado6-py311"
+      - id: "tornado6-py39"
         variables:
-           TOX_ENV: "tornado6-py311"
-           PYTHON_BINARY: "/opt/python/3.11/bin/python3"
-      - id: "asyncio-py311"
+           TOX_ENV: "tornado6-py39"
+           PYTHON_BINARY: "/opt/python/3.9/bin/python3"
+      - id: "asyncio-py39"
         variables:
-           TOX_ENV: "asyncio-py311"
-           PYTHON_BINARY: "/opt/python/3.11/bin/python3"
+           TOX_ENV: "asyncio-py39"
+           PYTHON_BINARY: "/opt/python/3.9/bin/python3"
 
   # Test Python 3.8 only on Mac.
   - id: tox-env-osx
@@ -942,9 +950,9 @@ axes:
         variables:
            INSTALL_TOX: true
            VIRTUALENV: "/opt/python/3.7/bin/python3 -m virtualenv"
-      - id: "ubuntu-20"
-        display_name: "Ubuntu 20.04"
-        run_on: "ubuntu2004-small"
+      - id: "rhel76"
+        display_name: "RHEL 7.6"
+        run_on: "rhel76-small"
         variables:
            INSTALL_TOX: true
            VIRTUALENV: "/opt/python/3.7/bin/python3 -m virtualenv"
@@ -987,11 +995,11 @@ buildvariants:
      - ".4.0"
      - ".3.6"
 
-- matrix_name: "test-ubuntu"
-  display_name: "${os}-${tox-env-ubuntu}-${ssl}"
+- matrix_name: "test-rhel7"
+  display_name: "${os}-${tox-env-rhel7}-${ssl}"
   matrix_spec:
-    os: "ubuntu-20"
-    tox-env-ubuntu: "*"
+    os: "rhel76"
+    tox-env-rhel7: "*"
     ssl: "*"
   tasks:
      - ".rapid"
@@ -1034,14 +1042,14 @@ buildvariants:
   display_name: "Enterprise Auth-${tox-env}"
   matrix_spec: {"tox-env": ["synchro37"], ssl: "ssl"}
   run_on:
-     - "ubuntu2004-small"
+     - "rhel84-small"
   tasks:
      - name: "test-enterprise-auth"
 
 - name: "docs"
   display_name: "Docs - Build"
   run_on:
-     - "ubuntu2004-small"
+     - "rhel84-small"
   expansions:
      TOX_ENV: "py3-sphinx-docs"
      INSTALL_TOX: true
@@ -1053,7 +1061,7 @@ buildvariants:
 - name: "doctests"
   display_name: "Docs - Test"
   run_on:
-     - "ubuntu2004-small"
+     - "rhel84-small"
   expansions:
      TOX_ENV: "py3-sphinx-doctest"
      INSTALL_TOX: true

diff --git a/tox.ini b/tox.ini
@@ -81,6 +81,8 @@ deps =
     synchro37: tornado>=6,<7
     synchro37: nose
 
+    pypy37: cryptography<3
+
 setenv =
     PYTHONWARNINGS="error,ignore:The distutils package is deprecated:DeprecationWarning"
 commands =