Add bashate checks to pep8 step
Similarly to pep8 checks, this allows enforcing a consistent style of the shell scripts accross modfications. For now only the indentation is enforced to reduce code churn. Closes-Bug: 1648099 Change-Id: Ie66cbe1aea4bd01a8bba8833ef6cbd2cff6a7c6a
This commit is contained in:
parent
73c5f6ea4f
commit
80fc5a2d42
6
cover.sh
6
cover.sh
@ -53,10 +53,8 @@ echo "Allowed to introduce missing lines : ${ALLOWED_EXTRA_MISSING}"
|
|||||||
echo "Missing lines in master : ${baseline_missing}"
|
echo "Missing lines in master : ${baseline_missing}"
|
||||||
echo "Missing lines in proposed change : ${current_missing}"
|
echo "Missing lines in proposed change : ${current_missing}"
|
||||||
|
|
||||||
if [ $allowed_missing -ge $current_missing ];
|
if [ $allowed_missing -ge $current_missing ]; then
|
||||||
then
|
if [ $baseline_missing -lt $current_missing ]; then
|
||||||
if [ $baseline_missing -lt $current_missing ];
|
|
||||||
then
|
|
||||||
show_diff $baseline_report $current_report
|
show_diff $baseline_report $current_report
|
||||||
echo "We believe you can test your code with 100% coverage!"
|
echo "We believe you can test your code with 100% coverage!"
|
||||||
else
|
else
|
||||||
|
@ -33,8 +33,7 @@ fi
|
|||||||
$configure_docker_storage_driver
|
$configure_docker_storage_driver
|
||||||
|
|
||||||
if [ "$DOCKER_STORAGE_DRIVER" = "overlay" ]; then
|
if [ "$DOCKER_STORAGE_DRIVER" = "overlay" ]; then
|
||||||
if [ $(echo -e "$(uname -r)\n3.18" | sort -V | head -1) \
|
if [ $(echo -e "$(uname -r)\n3.18" | sort -V | head -1) = $(uname -r) ]; then
|
||||||
= $(uname -r) ]; then
|
|
||||||
ERROR_MESSAGE="OverlayFS requires at least Linux kernel 3.18. Cluster node kernel version: $(uname -r)"
|
ERROR_MESSAGE="OverlayFS requires at least Linux kernel 3.18. Cluster node kernel version: $(uname -r)"
|
||||||
echo "ERROR: ${ERROR_MESSAGE}" >&2
|
echo "ERROR: ${ERROR_MESSAGE}" >&2
|
||||||
sh -c "${WAIT_CURL} --data-binary '{\"status\": \"FAILURE\", \"reason\": \"${ERROR_MESSAGE}\"}'"
|
sh -c "${WAIT_CURL} --data-binary '{\"status\": \"FAILURE\", \"reason\": \"${ERROR_MESSAGE}\"}'"
|
||||||
|
@ -14,7 +14,7 @@ FLANNEL_CONFIG_SERVICE=/etc/systemd/system/flannel-config.service
|
|||||||
FLANNEL_JSON=/etc/sysconfig/flannel-network.json
|
FLANNEL_JSON=/etc/sysconfig/flannel-network.json
|
||||||
|
|
||||||
sed -i '
|
sed -i '
|
||||||
/^FLANNEL_ETCD=/ s|=.*|="http://'"$ETCD_SERVER_IP"':2379"|
|
/^FLANNEL_ETCD=/ s|=.*|="http://'"$ETCD_SERVER_IP"':2379"|
|
||||||
' $FLANNELD_CONFIG
|
' $FLANNELD_CONFIG
|
||||||
|
|
||||||
. $FLANNELD_CONFIG
|
. $FLANNELD_CONFIG
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
echo "Configuring ${NETWORK_DRIVER} network service ..."
|
echo "Configuring ${NETWORK_DRIVER} network service ..."
|
||||||
|
|
||||||
if [ "$NETWORK_DRIVER" == "docker" ]; then
|
if [ "$NETWORK_DRIVER" == "docker" ]; then
|
||||||
DOCKER_NETWORK_OPTIONS="--cluster-store etcd://$ETCD_SERVER_IP:2379\
|
DOCKER_NETWORK_OPTIONS="--cluster-store etcd://$ETCD_SERVER_IP:2379 \
|
||||||
--cluster-advertise $SWARM_NODE_IP:9379"
|
--cluster-advertise $SWARM_NODE_IP:9379"
|
||||||
sed -i "/^DOCKER_NETWORK_OPTIONS=/ s#=.*#='$DOCKER_NETWORK_OPTIONS'#" \
|
sed -i "/^DOCKER_NETWORK_OPTIONS=/ s#=.*#='$DOCKER_NETWORK_OPTIONS'#" \
|
||||||
/etc/sysconfig/docker-network
|
/etc/sysconfig/docker-network
|
||||||
|
@ -6,6 +6,7 @@
|
|||||||
# ascii betical order.
|
# ascii betical order.
|
||||||
|
|
||||||
bandit>=1.1.0 # Apache-2.0
|
bandit>=1.1.0 # Apache-2.0
|
||||||
|
bashate>=0.2 # Apache-2.0
|
||||||
coverage>=4.0 # Apache-2.0
|
coverage>=4.0 # Apache-2.0
|
||||||
doc8 # Apache-2.0
|
doc8 # Apache-2.0
|
||||||
fixtures>=3.0.0 # Apache-2.0/BSD
|
fixtures>=3.0.0 # Apache-2.0/BSD
|
||||||
|
7
tox.ini
7
tox.ini
@ -98,6 +98,13 @@ commands =
|
|||||||
doc8 -e .rst specs/ doc/source/ contrib/ CONTRIBUTING.rst HACKING.rst README.rst
|
doc8 -e .rst specs/ doc/source/ contrib/ CONTRIBUTING.rst HACKING.rst README.rst
|
||||||
bash tools/flake8wrap.sh {posargs}
|
bash tools/flake8wrap.sh {posargs}
|
||||||
bandit -r magnum -x tests -n5 -ll
|
bandit -r magnum -x tests -n5 -ll
|
||||||
|
bash -c "find {toxinidir} \
|
||||||
|
-not \( -type d -name .?\* -prune \) \
|
||||||
|
-not \( -type d -name doc -prune \) \
|
||||||
|
-not \( -type d -name contrib -prune \) \
|
||||||
|
-type f \
|
||||||
|
-name \*.sh \
|
||||||
|
-print0 | xargs -0 bashate -v -iE006,E010,E042 -eE005"
|
||||||
|
|
||||||
[testenv:venv]
|
[testenv:venv]
|
||||||
commands = {posargs}
|
commands = {posargs}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user