Bump machine-executor image (#2985)

* Bump machine-executor image

Use Ubuntu 20.04 which uses Python 3.9 for the system interpreter.

* Simplify docs build

* Run urllib3 in docker

Co-authored-by: Brett Langdon <[email protected]>

Author: Kyle-Verhoog

.circleci/config.yml

@@ -22,7 +22,7 @@ orbs:
 
 machine_executor: &machine_executor
   machine:
-    image: ubuntu-1604:201903-01
+    image: ubuntu-2004:202107-02
   environment:
     - BOTO_CONFIG: /dev/null
     # https://support.circleci.com/hc/en-us/articles/360045268074-Build-Fails-with-Too-long-with-no-output-exceeded-10m0s-context-deadline-exceeded-
@@ -32,7 +32,7 @@ machine_executor: &machine_executor
       run:
         name: Set global pyenv
         command: |
-          pyenv global 3.6.5
+          pyenv global 3.9.4
 
 contrib_job: &contrib_job
   executor: ddtrace_dev
@@ -218,14 +218,6 @@ commands:
       - store_artifacts:
           path: test-results
 
-  build_docs:
-    steps:
-      - setup_riot
-      - run: |
-          sudo apt-get update
-          sudo apt-get install -y --no-install-recommends libenchant-dev
-      - run: riot run docs
-
 executors:
   cimg_base:
     docker:
@@ -856,12 +848,10 @@ jobs:
   urllib3:
     <<: *machine_executor
     steps:
-      - checkout
-      # `snapshot: true` will run `docker-compose logs -f` for us
-      - run: docker-compose up -d httpbin_local
       - run_test:
           pattern: 'urllib3'
           snapshot: true
+          docker_services: "httpbin_local"
 
   vertica:
     <<: *contrib_job
@@ -927,13 +917,13 @@ jobs:
 
   build_docs:
     # build documentation and store as an artifact
-    <<: *machine_executor
+    executor: ddtrace_dev
     steps:
+      - setup_riot
       - checkout
-      - *pyenv-set-global
-      - build_docs
       - run:
           command: |
+             riot -v run docs
              mkdir -p /tmp/docs
              cp -r docs/_build/html/* /tmp/docs
       - store_artifacts: