CI: Update to latest JJB version, fix code
The latest version of JJB is more restrictive, so several non-existent
jobs that were defined without error before needed to be removed from
all job definitions.
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
Change-Id: I8722fa5d6edfa778183ddb9bbee5c22db4c830d8
diff --git a/tox.ini b/tox.ini
index dbeedd8..8bbd5c0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,21 +1,51 @@
[tox]
minversion = 1.6
-envlist = coala,docs,pep8
+envlist = pre-commit
skipsdist = true
-[testenv:coala]
-basepython = python3
+[testenv:jenkins-jobs]
deps =
- coala
- coala-bears
+ jenkins-job-builder=={env:JJB_VERSION:6.4.1}
commands =
- python3 -m nltk.downloader punkt maxent_treebank_pos_tagger averaged_perceptron_tagger
- coala --non-interactive
+ jenkins-jobs {posargs:--help}
-# [testenv:docs]
-# deps = sphinx
-# commands = sphinx-build -b html -d {envtmpdir}/doctrees ./docs/ {toxinidir}/docs/_build/html
+[testenv:pre-commit-install]
+basepython = python3
+deps = pre-commit
+commands =
+ pre-commit install
+ pre-commit install --hook-type commit-msg
-[testenv:pep8]
-deps = flake8
-commands = flake8 scripts/
+[testenv:pre-commit-uninstall]
+basepython = python3
+deps = pre-commit
+commands =
+ pre-commit uninstall
+ pre-commit uninstall --hook-type commit-msg
+
+[testenv:pre-commit]
+description = Precommit checks for black, gitlint, etc.
+allowlist_externals =
+ /bin/sh
+deps =
+ pre-commit
+passenv = HOME
+commands =
+ pre-commit run --all-files --show-diff-on-failure
+ /bin/sh -c 'if ! git config --get user.name > /dev/null; then \
+ git config --global --add user.name "CI"; \
+ touch .git/REMOVE_USERNAME; fi'
+ /bin/sh -c 'if ! git config --get user.email > /dev/null; then \
+ git config --global --add user.email "ci@example.org"; \
+ touch .git/REMOVE_USEREMAIL; fi'
+ /bin/sh -c "if [ -f .git/COMMIT_EDITMSG ]; then \
+ cp .git/COMMIT_EDITMSG .git/COMMIT_MSGTOX; else \
+ git log HEAD -n1 --pretty=%B > .git/COMMIT_MSGTOX; fi"
+ pre-commit run gitlint --hook-stage commit-msg --commit-msg-filename .git/COMMIT_MSGTOX
+ /bin/sh -c "rm -f .git/COMMIT_MSGTOX"
+ /bin/sh -c "if [ -f .git/REMOVE_USERNAME ]; then \
+ git config --global --unset user.name; \
+ rm -f .git/REMOVE_USERNAME; fi"
+ /bin/sh -c "if [ -f .git/REMOVE_USEREMAIL ]; then \
+ git config --global --unset user.email; \
+ rm -f .git/REMOVE_USEREMAIL; fi"