From 68b83f763f7cbb5b5baac2e5f717ac16d330d812 Mon Sep 17 00:00:00 2001
From: Calen Pennington <cale@edx.org>
Date: Fri, 26 Jul 2019 14:42:45 -0400
Subject: [PATCH] Rename who-tests-what environment variables

---
 scripts/Jenkinsfiles/bokchoy | 2 +-
 scripts/generic-ci-tests.sh  | 4 ++--
 scripts/jenkins-report.sh    | 2 +-
 scripts/unit-tests.sh        | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/Jenkinsfiles/bokchoy b/scripts/Jenkinsfiles/bokchoy
index 667b04e59a..7bb64fc070 100644
--- a/scripts/Jenkinsfiles/bokchoy
+++ b/scripts/Jenkinsfiles/bokchoy
@@ -82,7 +82,7 @@ pipeline {
         stage("Combine Coverage") {
             when {
                 // Only combine coverage during context-collection
-                environment name: 'PYTEST_CONTEXTS', value: 'true'
+                environment name: 'COLLECT_WHO_TESTS_WHAT', value: 'true'
             }
             steps {
                 script {
diff --git a/scripts/generic-ci-tests.sh b/scripts/generic-ci-tests.sh
index 2acf3a5eaf..9f3fa82a0d 100755
--- a/scripts/generic-ci-tests.sh
+++ b/scripts/generic-ci-tests.sh
@@ -175,10 +175,10 @@ case "$TEST_SUITE" in
     "bok-choy")
 
         PAVER_ARGS="-n $NUMBER_OF_BOKCHOY_THREADS"
-        if [[ -n "$WHO_TESTS_WHAT" ]]; then
+        if [[ -n "$FILTER_WHO_TESTS_WHAT" ]]; then
             PAVER_ARGS="$PAVER_ARGS --with-wtw=origin/master"
         fi
-        if [[ -n "$PYTEST_CONTEXTS" ]]; then
+        if [[ -n "$COLLECT_WHO_TESTS_WHAT" ]]; then
             PAVER_ARGS="$PAVER_ARGS --pytest-contexts --coveragerc=common/test/acceptance/.coveragerc"
         fi
         export BOKCHOY_HEADLESS=true
diff --git a/scripts/jenkins-report.sh b/scripts/jenkins-report.sh
index 904834e6b0..b085826ee7 100755
--- a/scripts/jenkins-report.sh
+++ b/scripts/jenkins-report.sh
@@ -15,7 +15,7 @@ source scripts/jenkins-common.sh
 # Get the diff coverage and html reports for unit tests
 paver coverage -b $TARGET_BRANCH
 
-if [[ -n "$PYTEST_CONTEXTS" ]]; then
+if [[ -n "$COLLECT_WHO_TESTS_WHAT" ]]; then
     paver upload_coverage_to_s3
 fi
 
diff --git a/scripts/unit-tests.sh b/scripts/unit-tests.sh
index 02be8fdb06..c060d39a0a 100755
--- a/scripts/unit-tests.sh
+++ b/scripts/unit-tests.sh
@@ -50,10 +50,10 @@ else
     PARALLEL="--processes=-1"
 fi
 
-if [[ -n "$WHO_TESTS_WHAT" ]]; then
+if [[ -n "$FILTER_WHO_TESTS_WHAT" ]]; then
     PAVER_ARGS="$PAVER_ARGS --with-wtw=origin/master"
 fi
-if [[ -n "$PYTEST_CONTEXTS" ]]; then
+if [[ -n "$COLLECT_WHO_TESTS_WHAT" ]]; then
     PAVER_ARGS="$PAVER_ARGS --pytest-contexts"
 fi