Rename who-tests-what environment variables

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 {

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

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
 

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