Skip to content

Commit

Permalink
Use machine executor to allow reprotests to setarch
Browse files Browse the repository at this point in the history
setarch is not permittied in the docker container.
Because CircleCI only supports Ubuntu VM targets [1], we must add the Bionic sources to install dh-virtualenv under Focal as no installation candidate exists for that distribution in upstream repos.

[1] : https://circleci.com/docs/2.0/configuration-reference/#available-machine-images
  • Loading branch information
emkll committed Dec 23, 2020
1 parent d66213b commit e293606
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -281,15 +281,15 @@ common-steps:
version: 2.1
jobs:
tests:
docker:
- image: circleci/python:3.7-buster
machine:
image: ubuntu-2004:202010-01
steps:
- checkout
- run:
name: install test requirements and run tests
command: |
make install-deps
virtualenv .venv
virtualenv -p python3 .venv
source .venv/bin/activate
pip install -r test-requirements.txt
make test
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
tests/__pycache__/
debhelper-build-stamp
*.debhelper.log
5 changes: 5 additions & 0 deletions scripts/install-deps
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
# Installs required dependencies for building SecureDrop Worsktation packages.
# Assumes a Debian 10 machine, ideally a Qubes AppVM.

# If running in CI, we need to add the Ubuntu Bionic repo to download dh-virtualenv
if [[ -v CIRCLE_BUILD_URL ]]; then
echo "deb http://archive.ubuntu.com/ubuntu/ bionic universe" | sudo tee -a /etc/apt/sources.list
fi

sudo apt-get update
sudo apt-get install \
build-essential \
Expand Down

0 comments on commit e293606

Please sign in to comment.