From a1d82bbf246837c4ff83ca95246157aacf465c0a Mon Sep 17 00:00:00 2001 From: Trevor Bramwell Date: Wed, 20 Jul 2016 16:48:59 -0700 Subject: [PATCH] Move Releng Jobs under 'releng' folder This should help clarify what jobs belong to releng, and that the yaml file is unaffiliated with 'releng-defaults' and 'releng-macros'. - Step [1/2] in publishing jobs to the Jenkins sandbox - Explicitly passes the '-r' to jenkins-jobs so that other understand releng recursively tests jobs. This option is implied by the jenkins-job-builder configuration on the server. JIRA: RELENG-91 Change-Id: Ic4bad170b3d311376a2d081089ac538b53595728 Signed-off-by: Trevor Bramwell --- jjb/{releng-jobs.yaml => releng/releng-ci-jobs.yml} | 2 +- jjb/{verify-releng => releng/verify-releng.sh} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename jjb/{releng-jobs.yaml => releng/releng-ci-jobs.yml} (98%) rename jjb/{verify-releng => releng/verify-releng.sh} (95%) diff --git a/jjb/releng-jobs.yaml b/jjb/releng/releng-ci-jobs.yml similarity index 98% rename from jjb/releng-jobs.yaml rename to jjb/releng/releng-ci-jobs.yml index d73ef50b7..60551f5bb 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng/releng-ci-jobs.yml @@ -50,7 +50,7 @@ builders: - shell: - !include-raw: verify-releng + !include-raw: verify-releng.sh publishers: - archive-artifacts: diff --git a/jjb/verify-releng b/jjb/releng/verify-releng.sh similarity index 95% rename from jjb/verify-releng rename to jjb/releng/verify-releng.sh index 82d76e366..5c2dbff7a 100755 --- a/jjb/verify-releng +++ b/jjb/releng/verify-releng.sh @@ -18,4 +18,4 @@ for x in $(find . -name *\.yml); do done source /opt/virtualenv/jenkins-job-builder/bin/activate -jenkins-jobs test -o job_output jjb/ +jenkins-jobs test -o job_output -r jjb/ -- 2.16.6