diff options
author | Andrew Grimberg <agrimberg@linuxfoundation.org> | 2016-02-22 09:43:38 -0800 |
---|---|---|
committer | Andrew Grimberg <agrimberg@linuxfoundation.org> | 2016-02-22 09:43:38 -0800 |
commit | c20075ac3e89e88149ae49418b77bb84843e05df (patch) | |
tree | 2c6f6a764a7d4940ce6d6b80882bf22edecf8d81 /jjb/ci-management | |
parent | 7d0aa921e805e22c7af142bccc770706d9c37375 (diff) |
Move ci-management jobs to own directory
Let's make the ci-management jobs be a little more consistent with other
projects and have them live in their own directory. Global macros will
still live at the root jjb level.
Change-Id: Ie9bd90ae049b4b83fad050b697e14aced18de4a6
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
Diffstat (limited to 'jjb/ci-management')
-rw-r--r-- | jjb/ci-management/ci-management-jobs.yaml | 68 | ||||
-rw-r--r-- | jjb/ci-management/include-raw-jjb-update.sh | 10 |
2 files changed, 78 insertions, 0 deletions
diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml new file mode 100644 index 000000000..dec69b0a7 --- /dev/null +++ b/jjb/ci-management/ci-management-jobs.yaml @@ -0,0 +1,68 @@ +- project: + name: ci-management-jobs + jobs: + - 'ci-management-verify-jjb' + - 'ci-management-merge' + + project: 'ci-management' + +- job-template: + name: ci-management-verify-jjb + + project-type: freestyle + node: jjb + concurrent: true + + logrotate: + daysToKeep: 30 + numToKeep: 10 + artifactDaysToKeep: -1 + artifactNumToKeep: 5 + + scm: + - zuul-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '$ZUUL_REF' + commit: '$ZUUL_COMMIT' + + wrappers: + - ssh-agent-credentials: + users: + - '{ssh-credentials}' + + builders: + - shell: | + jenkins-jobs test --recursive -o job_output jjb/ + - ci-management-check-unicode + + publishers: + - archive-artifacts: + artifacts: 'job_output/*' + +- job-template: + name: 'ci-management-merge' + + project-type: freestyle + node: jjb + + logrotate: + daysToKeep: 30 + numToKeep: 40 + artifactDaysToKeep: -1 + artifactNumToKeep: 5 + + scm: + - zuul-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + commit: 'origin/$ZUUL_BRANCH' + + wrappers: + - ssh-agent-credentials: + users: + - '{ssh-credentials}' + + builders: + - shell: + !include-raw-escape include-raw-jjb-update.sh + diff --git a/jjb/ci-management/include-raw-jjb-update.sh b/jjb/ci-management/include-raw-jjb-update.sh new file mode 100644 index 000000000..05707d2b8 --- /dev/null +++ b/jjb/ci-management/include-raw-jjb-update.sh @@ -0,0 +1,10 @@ +jenkins-jobs update --recursive --delete-old jjb/ + +# Submit patches for any jobs that can be auto updated +function submitJJB { + git commit -asm "Update automated project templates" + git push origin HEAD:refs/for/master +} + +gitdir=$(git rev-parse --git-dir); scp -p -P 29418 rotterdam-jobbuilder@gerrit.fd.io:hooks/commit-msg ${gitdir}/hooks/ +git diff --exit-code || submitJJB |