From 754eee3e1294c1381ecc802b1217895bcfab360f Mon Sep 17 00:00:00 2001
From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Wed, 9 Nov 2016 12:33:46 -0800
Subject: [PATCH] Rearrange Releng Job and Parameter Files

Individual project jobs can now be tested using:

  jenkins-jobs test -r jjb/global:jjb/$project

- Rename '.yaml' files to '.yml' so they get checked by the
  verify-releng.sh script, and update the script to include checking of
  '.yaml' files.
- Move parameter and macro files under new 'global' directory.

Change-Id: I6b74f5d8af2bced3256a7f4a33983df5310511a2
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
---
 jjb/{opnfv => global}/installer-params.yml               | 0
 jjb/{releng-defaults.yaml => global/releng-defaults.yml} | 0
 jjb/{releng-macros.yaml => global/releng-macros.yml}     | 0
 jjb/{opnfv => global}/slave-params.yml                   | 0
 jjb/{opnfv => releng}/artifact-cleanup.yml               | 0
 jjb/{opnfv => releng}/opnfv-docker.sh                    | 0
 jjb/{opnfv => releng}/opnfv-docker.yml                   | 0
 jjb/{opnfv => releng}/opnfv-docs.yml                     | 0
 jjb/{opnfv => releng}/opnfv-lint.yml                     | 0
 jjb/{opnfv => releng}/opnfv-utils.yml                    | 0
 jjb/releng/verify-releng.sh                              | 2 +-
 11 files changed, 1 insertion(+), 1 deletion(-)
 rename jjb/{opnfv => global}/installer-params.yml (100%)
 rename jjb/{releng-defaults.yaml => global/releng-defaults.yml} (100%)
 rename jjb/{releng-macros.yaml => global/releng-macros.yml} (100%)
 rename jjb/{opnfv => global}/slave-params.yml (100%)
 rename jjb/{opnfv => releng}/artifact-cleanup.yml (100%)
 rename jjb/{opnfv => releng}/opnfv-docker.sh (100%)
 rename jjb/{opnfv => releng}/opnfv-docker.yml (100%)
 rename jjb/{opnfv => releng}/opnfv-docs.yml (100%)
 rename jjb/{opnfv => releng}/opnfv-lint.yml (100%)
 rename jjb/{opnfv => releng}/opnfv-utils.yml (100%)

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"
-- 
2.16.6