From: Ryota Mibu Date: Wed, 30 Nov 2016 06:46:02 +0000 (+0000) Subject: Merge "Rearrange Releng Job and Parameter Files" X-Git-Tag: danube.1.0~612 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7471fc66629d6f138099ec7e2ea5ebf9a68a6289;hp=ce14e0678addbfc0e1e55ba37811981322475197;p=releng.git Merge "Rearrange Releng Job and Parameter Files" --- diff --git a/jjb/opnfv/installer-params.yml b/jjb/global/installer-params.yml similarity index 100% rename from jjb/opnfv/installer-params.yml rename to jjb/global/installer-params.yml diff --git a/jjb/releng-defaults.yaml b/jjb/global/releng-defaults.yml similarity index 100% rename from jjb/releng-defaults.yaml rename to jjb/global/releng-defaults.yml diff --git a/jjb/releng-macros.yaml b/jjb/global/releng-macros.yml similarity index 100% rename from jjb/releng-macros.yaml rename to jjb/global/releng-macros.yml diff --git a/jjb/opnfv/slave-params.yml b/jjb/global/slave-params.yml similarity index 100% rename from jjb/opnfv/slave-params.yml rename to jjb/global/slave-params.yml diff --git a/jjb/opnfv/artifact-cleanup.yml b/jjb/releng/artifact-cleanup.yml similarity index 100% rename from jjb/opnfv/artifact-cleanup.yml rename to jjb/releng/artifact-cleanup.yml diff --git a/jjb/opnfv/opnfv-docker.sh b/jjb/releng/opnfv-docker.sh similarity index 100% rename from jjb/opnfv/opnfv-docker.sh rename to jjb/releng/opnfv-docker.sh diff --git a/jjb/opnfv/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml similarity index 100% rename from jjb/opnfv/opnfv-docker.yml rename to jjb/releng/opnfv-docker.yml diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/releng/opnfv-docs.yml similarity index 100% rename from jjb/opnfv/opnfv-docs.yml rename to jjb/releng/opnfv-docs.yml diff --git a/jjb/opnfv/opnfv-lint.yml b/jjb/releng/opnfv-lint.yml similarity index 100% rename from jjb/opnfv/opnfv-lint.yml rename to jjb/releng/opnfv-lint.yml diff --git a/jjb/opnfv/opnfv-utils.yml b/jjb/releng/opnfv-utils.yml similarity index 100% rename from jjb/opnfv/opnfv-utils.yml rename to jjb/releng/opnfv-utils.yml diff --git a/jjb/releng/verify-releng.sh b/jjb/releng/verify-releng.sh index 5c2dbff7a..682a8beda 100755 --- a/jjb/releng/verify-releng.sh +++ b/jjb/releng/verify-releng.sh @@ -8,7 +8,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## #test for non-ascii characters, these can pass the test and end up breaking things in production -for x in $(find . -name *\.yml); do +for x in $(find . -name *\.yml -or -name *\.yaml); do if LC_ALL=C grep -q '[^[:print:][:space:]]' "$x"; then echo "file "$x" contains non-ascii characters"