From 491458673b0bb5704f8d7f3fa7a732257e4ae416 Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Wed, 20 Apr 2022 14:06:10 +0100
Subject: [PATCH] tests: Manage ANSIBLE_STRATEGY with Tox

---
 .ci/ci_lib.py | 2 --
 tox.ini       | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.ci/ci_lib.py b/.ci/ci_lib.py
index 65b7265a..67d20a27 100644
--- a/.ci/ci_lib.py
+++ b/.ci/ci_lib.py
@@ -193,8 +193,6 @@ class Fold(object):
     def __exit__(self, _1, _2, _3): pass
 
 
-os.environ.setdefault('ANSIBLE_STRATEGY',
-    os.environ.get('STRATEGY', 'mitogen_linear'))
 GIT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
 # Used only when MODE=mitogen
 DISTRO = os.environ.get('DISTRO', 'debian9')
diff --git a/tox.ini b/tox.ini
index 43e2537e..61a8cca9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -85,6 +85,7 @@ passenv =
     AWS_SECRET_ACCESS_KEY
     HOME
 setenv =
+    ANSIBLE_STRATEGY = mitogen_linear
     NOCOVERAGE_ERASE = 1
     NOCOVERAGE_REPORT = 1
     # Only applicable to MODE=mitogen
@@ -115,7 +116,7 @@ setenv =
     mode_ansible: MODE=ansible
     mode_debops_common: MODE=debops_common
     mode_mitogen: MODE=mitogen
-    strategy_linear: STRATEGY=linear
+    strategy_linear: ANSIBLE_STRATEGY=linear
 whitelist_externals =
     docker
     docker-credential-secretservice