From 28ec7ef42262ae4fb9bb5d7b6d6701fea1a46536 Mon Sep 17 00:00:00 2001
From: Kushal Das <mail@kushaldas.in>
Date: Tue, 18 Aug 2020 00:14:22 +0530
Subject: [PATCH] Fixes #5454 make builder-debs-focal

This adds a new build target to build the Debian packages on Focal.
It also includes two variables to be used as ansible override
during future build steps in Ansible.
---
 Makefile                                         | 7 +++++++
 molecule/builder-focal/ansible-override-vars.yml | 3 +++
 molecule/builder-focal/molecule.yml              | 2 ++
 3 files changed, 12 insertions(+)
 create mode 100644 molecule/builder-focal/ansible-override-vars.yml

diff --git a/Makefile b/Makefile
index 9f784cb8759..666b42cd074 100644
--- a/Makefile
+++ b/Makefile
@@ -329,6 +329,13 @@ build-debs-notest: ## Build SecureDrop Debian packages without running tests.
 	@$(SDROOT)/devops/scripts/build-debs.sh notest
 	@echo
 
+.PHONY: build-debs-focal
+build-debs-focal: ## Build and test SecureDrop Debian packages.
+	@echo "Building SecureDrop Debian packages..."
+	@$(SDROOT)/devops/scripts/build-debs.sh notest focal
+	@echo
+
+
 
 ########################
 #
diff --git a/molecule/builder-focal/ansible-override-vars.yml b/molecule/builder-focal/ansible-override-vars.yml
new file mode 100644
index 00000000000..38ee4f76696
--- /dev/null
+++ b/molecule/builder-focal/ansible-override-vars.yml
@@ -0,0 +1,3 @@
+---
+securedrop_build_focal_support: True
+securedrop_staging_install_target_distro: "focal"
diff --git a/molecule/builder-focal/molecule.yml b/molecule/builder-focal/molecule.yml
index aafcd70f9c6..fb3b221a171 100644
--- a/molecule/builder-focal/molecule.yml
+++ b/molecule/builder-focal/molecule.yml
@@ -39,6 +39,8 @@ provisioner:
   inventory:
     links:
       group_vars: ../../install_files/ansible-base/group_vars
+  options:
+    e: "@ansible-override-vars.yml"
   config_options:
     defaults:
       interpreter_python: auto