Use "allowlist" and "blocklist" terminology

Following example seen with Android and Chrome projects:
https://android-review.googlesource.com/c/platform/frameworks/ml/+/970739
https://chromium.googlesource.com/chromium/src/+/master/styleguide/inclusive_code.md#racially-neutral

Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
Change-Id: If2407902b31052c09e031b44040c12ddf3345663

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 76550aa83fdad803f3eb5c5db1ded7436ee23f6a..d5fca6febd5b0be7de424c0e0c9f45a4feaa0fab 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -62,7 +62,7 @@
     stream:
       - aluminium:
           branch: 'master'
-          csit-blacklist: >
+          csit-blocklist: >
               alto bier coe controller detnet dluxapps groupbasedpolicy l2switch mdsal
               nemo p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
               gate longevity sanity tdd tempest wip
@@ -78,7 +78,7 @@
           csit-weekly-list: '{csit-weekly-list-aluminium}'
       - magnesium:
           branch: 'stable/magnesium'
-          csit-blacklist: >
+          csit-blocklist: >
               alto bier coe detnet dluxapps groupbasedpolicy l2switch mdsal nemo
               p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
               gate longevity sanity tdd tempest wip
@@ -94,7 +94,7 @@
           csit-weekly-list: '{csit-weekly-list-magnesium}'
       - sodium:
           branch: 'stable/sodium'
-          csit-blacklist: >
+          csit-blocklist: >
               alto bier dluxapps groupbasedpolicy jsonrpc l2switch mdsal nemo
               p4plugin packetcable sxp telemetry tsdr unimgr usc yangtools
               gate longevity sanity tdd tempest wip
@@ -573,9 +573,9 @@
           branch: master  # Hardcode as releng/builder only has master
           lftools-version: '{lftools-version}'
       - string:
-          name: CSIT_BLACKLIST
-          default: '{csit-blacklist}'
-          description: Space separated list of jobs strings to blacklist.
+          name: CSIT_BLOCKLIST
+          default: '{csit-blocklist}'
+          description: Space separated list of jobs strings to blocklist.
 
     scm:
       - lf-infra-gerrit-scm:

diff --git a/jjb/integration/update-csit-tests.sh b/jjb/integration/update-csit-tests.sh
index 92bfe1e45c077b41c026ce807cb65e5dfac4b4a6..8d2c46a6d399bb7279a179117c18ab349f965eb9 100644 (file)
--- a/jjb/integration/update-csit-tests.sh
+++ b/jjb/integration/update-csit-tests.sh
@@ -22,8 +22,8 @@ jobs=($(xmlstarlet sel -t -m '//hudson/job' \
 job_list="${WORKSPACE}/jjb/integration/csit-jobs-${STREAM}.lst"
 rm "$job_list"
 for job in "${jobs[@]}"; do
-    echo "Checking if $job is blacklisted."
-    if [[ ! $job =~ update-csit-tests|${CSIT_BLACKLIST// /\|} ]]; then
+    echo "Checking if $job is blocklisted."
+    if [[ ! $job =~ update-csit-tests|${CSIT_BLOCKLIST// /\|} ]]; then
         echo "${job}," >> "$job_list"
         echo "    Added $job to job list."
     fi