From 43d6a6d54948945daeb7825da2759caaaca3752d Mon Sep 17 00:00:00 2001
From: Conor Schaefer <conor@freedom.press>
Date: Fri, 15 Jan 2021 17:35:30 -0800
Subject: [PATCH] Attempts to get reprotest working in CI

Force buster platform, even in CI Focal environment

Modifies pkg path for lookup in CI

Moves reprotest suite to docker, to use Buster reprotest.
---
 .circleci/config.yml        | 6 +++---
 scripts/build-debianpackage | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5d9602db..4a39010d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -144,7 +144,7 @@ common-steps:
         export PKG_PATH=~/packaging/$PKG_NAME/dist/$PKG_NAME-$VERSION_TO_BUILD.tar.gz
         export PKG_VERSION=$VERSION_TO_BUILD
         make $PKG_NAME
-        ls ~/debbuild/packaging/*.deb
+        ls ~/project/build/debbuild/packaging/*.deb
 
   - &builddebianpackagefromexistingtarball
     run:
@@ -288,8 +288,8 @@ common-steps:
 version: 2.1
 jobs:
   tests:
-    machine:
-      image: ubuntu-2004:202010-01
+    docker:
+      - image: circleci/python:3.7-buster
     steps:
       - checkout
       - run:
diff --git a/scripts/build-debianpackage b/scripts/build-debianpackage
index 2db1f873..3b7e521b 100755
--- a/scripts/build-debianpackage
+++ b/scripts/build-debianpackage
@@ -28,7 +28,7 @@ mkdir -p "$TOP_BUILDDIR"
 rm -rf "${TOP_BUILDDIR:?}/${PKG_NAME}"
 mkdir -p "${TOP_BUILDDIR}/${PKG_NAME}"
 # Move changelog into place (we have separate changelogs for each platform)
-PLATFORM="$(lsb_release -sc)"
+PLATFORM="${PKG_PLATFORM:-buster}"
 
 # Validate required args.
 if [[ -z "${PKG_NAME:-}" ]]; then