Forces Python3 in all scenarios

Removes unused vagrant-based scenarios

Makefile

@@ -8,6 +8,14 @@ securedrop-rebuild: ## Rebuilds SecureDrop kernels from source tarball.
 	@ansible-playbook -vv --diff molecule/securedrop-rebuild/playbook.yml \
 		-i molecule/securedrop-rebuild/.molecule/ansible_inventory.yml
 
+.PHONY: securedrop-core
+securedrop-core: ## Builds kernels for SecureDrop servers
+	molecule converge -s securedrop-docker
+
+.PHONY: securedrop-workstation
+securedrop-workstation: ## Builds kernels for SecureDrop Workstation VMs
+	molecule converge -s workstation
+
 .PHONY: help
 help: ## Prints this message and exits.
 	@printf "Subcommands:\n\n"

molecule/ci-minipli/molecule.yml

@@ -13,6 +13,8 @@ provisioner:
   name: ansible
   lint:
     name: ansible-lint
+  options:
+    e: "@../ansible-override-vars.yml"
 scenario:
   name: ci-minipli
   test_sequence:

molecule/ci-official-stable3/Dockerfile.j2

@@ -0,0 +1 @@
+../ci-skel/Dockerfile.j2

molecule/ci-official-stable3/molecule.yml

@@ -13,6 +13,8 @@ provisioner:
   name: ansible
   lint:
     name: ansible-lint
+  options:
+    e: "@../ansible-override-vars.yml"
 scenario:
   name: ci-official-stable3
   test_sequence:

molecule/ci-skel/Dockerfile.j2

@@ -2,19 +2,16 @@
 
 FROM {{ item.image }}@{{ (lookup('pipe', 'cat ../container-hashes.yml')|from_yaml)[item.image_hash_lookup] }}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python python-devel python2-dnf bash && dnf clean all; \
-    elif [ $(command -v yum) ]; then yum makecache fast && yum update -y && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
-    elif [ $(command -v zypper) ]; then zypper refresh && zypper update -y && zypper install -y python sudo bash python-xml && zypper clean -a; \
-    elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; fi
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python3 python3-requests sudo bash ca-certificates && apt-get clean; \
+    fi
 
 
 RUN apt-get install -y sudo paxctl
 RUN adduser --disabled-password vagrant
 RUN usermod -aG sudo vagrant
 RUN echo "%sudo ALL=(ALL:ALL) NOPASSWD: ALL" > /etc/sudoers
 
-RUN paxctl -cm /usr/bin/python2.7
+RUN paxctl -cm /usr/bin/python3
 
 
 USER vagrant

molecule/ci-skel/molecule.yml

@@ -13,6 +13,8 @@ provisioner:
   name: ansible
   lint:
     name: ansible-lint
+  options:
+    e: "@../ansible-override-vars.yml"
 scenario:
   name: ci
   test_sequence:

molecule/ci-unofficial/molecule.yml

@@ -13,6 +13,8 @@ provisioner:
   name: ansible
   lint:
     name: ansible-lint
+  options:
+    e: "@../ansible-override-vars.yml"
 scenario:
   name: ci-unofficial
   test_sequence:

molecule/securedrop-docker/molecule.yml

@@ -14,7 +14,7 @@ provisioner:
   lint:
     name: ansible-lint
   options:
-    e: "@ansible-override-vars.yml"
+    e: "@../ansible-override-vars.yml"
 scenario:
   name: securedrop-docker
   test_sequence:

molecule/workstation/Dockerfile.j2

@@ -2,17 +2,13 @@
 
 FROM {{ item.image }}@{{ (lookup('pipe', 'cat ../container-hashes.yml')|from_yaml)[item.image_hash_lookup] }}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python sudo bash ca-certificates libssl-dev libelf-dev && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python python-devel python2-dnf bash libssl-dev libelf-dev&& dnf clean all; \
-    elif [ $(command -v yum) ]; then yum makecache fast && yum update -y && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
-    elif [ $(command -v zypper) ]; then zypper refresh && zypper update -y && zypper install -y python sudo bash python-xml  libssl-dev libelf-dev && zypper clean -a; \
-    elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates libssl-dev libelf-dev; fi
-
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python3 python3-requests sudo bash ca-certificates libssl-dev libelf-dev && apt-get clean; \
+    fi
 
 RUN apt-get install -y sudo paxctl
 RUN adduser --disabled-password vagrant
 RUN usermod -aG sudo vagrant
 
-RUN paxctl -cm /usr/bin/python2.7
+RUN paxctl -cm /usr/bin/python3
 
 USER vagrant

molecule/workstation/molecule.yml

@@ -13,6 +13,8 @@ provisioner:
   name: ansible
   lint:
     name: ansible-lint
+  options:
+    e: "@../ansible-override-vars.yml"
 scenario:
   name: workstation
   test_sequence: