add ci jobs for bullseye

freedomofpress · May 26, 2022 · 9b35414 · 9b35414
1 parent f5c273d
commit 9b35414
Showing 1 changed file with 47 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,12 +2,29 @@
 common-steps:
   - &install_deps
     run:
-      name: Install base dependencies for Debian python
+      name: Install base dependencies for Bullseye python
+      command: |
+        set -e
+        apt-get update && apt-get install -y sudo make git gnupg
+
+  - &install_deps_on_buster
+    run:
+      name: Install base dependencies for Buster python
       command: |
         set -e
         pip uninstall virtualenv -y || true
         apt-get update && apt-get install -y sudo make git gnupg python3 python3-venv
 
+  - &run_tests
+    run:
+      name: Install requirements and run tests
+      command: |
+        set -e
+        make venv
+        source .venv/bin/activate
+        export PYTHONPATH=$PYTHONPATH:.  # so alembic can get to Base metadata
+        make check --keep-going
+
   - &run_tests_on_buster
     run:
       name: Install requirements and run tests
@@ -70,12 +87,34 @@ common-steps:
 
 version: 2
 jobs:
-  build-buster:
+  build-bullseye:
     docker:
-      - image: debian:buster
+      - image: circleci/python:3.9-bullseye
+    steps:
+      - *install_deps
+      - checkout
+      - *install_packaging_dependencies
+      - *verify_requirements
+      - *build_debian_package
+
+  test-bullseye:
+    docker:
+      - image: circleci/python:3.9-bullseye
     steps:
       - *install_deps
       - checkout
+      - run: apt-get update && apt-get install -y sqlite3 libqt5x11extras5 xvfb python3-tk python3-dev
+      - *run_tests
+      - store_test_results:
+          path: test-results
+      - *run_lint
+      - *check_python_dependencies_for_vulns
+
+    docker:
+      - image: debian:buster
+    steps:
+      - *install_deps_on_buster
+      - checkout
       - *install_packaging_dependencies
       - *verify_requirements
       - *build_debian_package
@@ -84,7 +123,7 @@ jobs:
     docker:
       - image: debian:buster
     steps:
-      - *install_deps
+      - *install_deps_on_buster
       - checkout
       - run: apt-get update && apt-get install -y sqlite3 libqt5x11extras5 xvfb python3-tk python3-dev
       - *run_tests_on_buster
@@ -97,6 +136,8 @@ workflows:
   version: 2
   securedrop_client_ci:
     jobs:
+      - test-bullseye
+      - build-bullseye
       - test-buster
       - build-buster
 
@@ -109,5 +150,7 @@ workflows:
               only:
                 - main
     jobs:
+      - test-bullseye
+      - build-bullseye
       - test-buster
       - build-buster