From: Andrew Grimberg Date: Mon, 16 Oct 2017 16:57:24 +0000 (+0000) Subject: Merge "Fix jjb-verify job to ignore the docs directory" X-Git-Tag: v0.11.0~16 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=56b5f9659c5803cb136b2ed624e9c38f479133ec;hp=d712c27eebb3f25c191f50975acbe3945debdddd;p=releng%2Fglobal-jjb.git Merge "Fix jjb-verify job to ignore the docs directory" --- diff --git a/.jjb-test/expected-xml/gerrit-ciman-jjb-verify b/.jjb-test/expected-xml/gerrit-ciman-jjb-verify index b59d3c6e..2a9896fa 100644 --- a/.jjb-test/expected-xml/gerrit-ciman-jjb-verify +++ b/.jjb-test/expected-xml/gerrit-ciman-jjb-verify @@ -303,7 +303,7 @@ popd ############################################################################## echo "---> jjb-check-unicode.sh" -if LC_ALL=C grep -r '[^[:print:][:space:]]' jjb/; then +if LC_ALL=C grep --exclude=docs/ -r '[^[:print:][:space:]]' jjb/; then echo "Found files containing non-ascii characters." exit 1 fi diff --git a/.jjb-test/expected-xml/github-ciman-jjb-verify b/.jjb-test/expected-xml/github-ciman-jjb-verify index 3a10bb80..5705ebc9 100644 --- a/.jjb-test/expected-xml/github-ciman-jjb-verify +++ b/.jjb-test/expected-xml/github-ciman-jjb-verify @@ -251,7 +251,7 @@ popd ############################################################################## echo "---> jjb-check-unicode.sh" -if LC_ALL=C grep -r '[^[:print:][:space:]]' jjb/; then +if LC_ALL=C grep --exclude=docs/ -r '[^[:print:][:space:]]' jjb/; then echo "Found files containing non-ascii characters." exit 1 fi diff --git a/shell/jjb-check-unicode.sh b/shell/jjb-check-unicode.sh index c1293bac..e1d28a02 100644 --- a/shell/jjb-check-unicode.sh +++ b/shell/jjb-check-unicode.sh @@ -10,7 +10,7 @@ ############################################################################## echo "---> jjb-check-unicode.sh" -if LC_ALL=C grep -r '[^[:print:][:space:]]' jjb/; then +if LC_ALL=C grep --exclude=docs/ -r '[^[:print:][:space:]]' jjb/; then echo "Found files containing non-ascii characters." exit 1 fi