osmith has uploaded this change for review.
lint: do "docker run --rm" check only in jenkins
Change-Id: I00a28a04b0fae8804846948a155c6214bf1aca00
---
M jobs/gerrit-lint.yml
M lint/lint_diff.sh
2 files changed, 16 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/33/36833/1
diff --git a/jobs/gerrit-lint.yml b/jobs/gerrit-lint.yml
index 3039829..62dc969 100644
--- a/jobs/gerrit-lint.yml
+++ b/jobs/gerrit-lint.yml
@@ -50,6 +50,7 @@
git -C osmo-ci log --oneline
cd code-from-gerrit
+ export CHECK_DOCKER_RM=1
../osmo-ci/lint/lint_diff.sh HEAD~1
wrappers:
diff --git a/lint/lint_diff.sh b/lint/lint_diff.sh
index 662bdd3..b8a84c4 100755
--- a/lint/lint_diff.sh
+++ b/lint/lint_diff.sh
@@ -21,10 +21,12 @@
ERROR=0
-echo "Running docker_run_rm.sh on the whole tree..."
-echo
-if ! "$SCRIPT_DIR"/docker_run_rm.sh; then
- ERROR=1
+if [ "$CHECK_DOCKER_RM" = 1 ]; then
+ echo "Running docker_run_rm.sh on the whole tree..."
+ echo
+ if ! "$SCRIPT_DIR"/docker_run_rm.sh; then
+ ERROR=1
+ fi
fi
echo "Running checkpatch on 'git diff $COMMIT'..."
To view, visit change 36833. To unsubscribe, or for help writing mail filters, visit settings.