diff --git a/playbooks/proposal/propose_update.sh b/playbooks/proposal/propose_update.sh index ae5a8d0fca..79be07d4ac 100755 --- a/playbooks/proposal/propose_update.sh +++ b/playbooks/proposal/propose_update.sh @@ -36,7 +36,7 @@ elif [ "$OWN_PROJECT" == "requirements-constraints" ] ; then VENV=$(readlink -f .tox/venv) $VENV/bin/pip install -e . function update { - $VENV/bin/generate-constraints -b blacklist.txt -p /usr/bin/python3.10 \ + $VENV/bin/generate-constraints -d denylist.txt -p /usr/bin/python3.10 \ --version-map 3.10:3.9 \ -r global-requirements.txt > $1/upper-constraints.txt } diff --git a/roles/copy-wheels/files/wheel-copy.sh b/roles/copy-wheels/files/wheel-copy.sh index f9ee0fffa0..d362afdeeb 100755 --- a/roles/copy-wheels/files/wheel-copy.sh +++ b/roles/copy-wheels/files/wheel-copy.sh @@ -4,7 +4,7 @@ WHEELHOUSE_DIR=$1 MIRROR_ROOT=$2 -# Pre-filter any blacklisted package name patterns +# Pre-filter any denylisted package name patterns find "$WHEELHOUSE_DIR/" '(' \ -name "pip-*-none-any.whl" -o \ -name "setuptools-*-none-any.whl" -o \ diff --git a/tools/zuul-projects-checks.py b/tools/zuul-projects-checks.py index 5f3482b4c7..b68aeba3a7 100755 --- a/tools/zuul-projects-checks.py +++ b/tools/zuul-projects-checks.py @@ -83,11 +83,11 @@ def check_release_jobs(): return errors -def blacklist_jobs(): +def denylist_jobs(): """Check that certain jobs and templates are *not* used.""" # Currently only handles templates - blacklist_templates = [ + denylist_templates = [ 'system-required' ] @@ -103,7 +103,7 @@ def blacklist_jobs(): if name.startswith("^(airship|"): continue found = [tmpl for tmpl in project.get('templates', []) - if tmpl in blacklist_templates] + if tmpl in denylist_templates] if found: errors = True print(" ERROR: Found obsolete template for %s:" % name) @@ -193,7 +193,7 @@ def check_only_boilerplate(): def check_all(): errors = check_projects_sorted() - errors = blacklist_jobs() or errors + errors = denylist_jobs() or errors errors = check_release_jobs() or errors errors = check_voting() or errors errors = check_only_boilerplate() or errors