aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/core/Dockerfile1
-rw-r--r--tox.ini12
2 files changed, 5 insertions, 8 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 9777f199..c35ba7d1 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -16,6 +16,7 @@ RUN apk -U upgrade && \
git fetch --tags https://review.opendev.org/openstack/requirements $OPENSTACK_TAG && \
git checkout FETCH_HEAD) && \
sed -i -E /^packaging==+.*$/d /src/requirements/upper-constraints.txt && \
+ sed -i -E /^PyYAML==+.*$/d /src/requirements/upper-constraints.txt && \
case $(uname -m) in aarch*|arm*) \
sed -i -E /^PyNaCl=/d /src/requirements/upper-constraints.txt && \
apk add --no-cache py3-pynacl ;; esac && \
diff --git a/tox.ini b/tox.ini
index d2d67009..460d1b6b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,9 +29,7 @@ commands = pylint \
[testenv:yamllint]
basepython = python3.10
-files =
- .travis.yml
- docker
+files =.travis.yml docker
commands =
yamllint {[testenv:yamllint]files}
@@ -41,15 +39,13 @@ commands = bandit -r functest_kubernetes -x tests -n 5 -ll
[testenv:bashate]
basepython = python3.10
-files =
- build.sh
- functest_kubernetes/ci/download_images.sh
+files =build.sh functest_kubernetes/ci/download_images.sh
commands = bashate -e E005,E006,E042,E043 {[testenv:bashate]files}
[testenv:perm]
basepython = python3.10
-whitelist_externals = bash
-path=. -not -path './.tox/*' -not -path './.git/*' -not -path './doc/pres/reveal.js/*'
+allowlist_externals = bash
+path=. -not -path './.tox/*' -not -path './.git/*' -not -path './doc/pres/reveal.js/*' -not -path './elements/functest-kubernetes/install.d/*'
commands =
bash -c "\
find {[testenv:perm]path} \( -type f -not -perm 644 -o -type d -not -perm 755 \) \