diff options
Diffstat (limited to 'jjb/ci-management')
| -rw-r--r-- | jjb/ci-management/ci-management-jobs.yaml | 6 | ||||
| -rw-r--r-- | jjb/ci-management/include-raw-jjb-update.sh | 10 |
2 files changed, 4 insertions, 12 deletions
diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml index ddef5ee9d..226d77f91 100644 --- a/jjb/ci-management/ci-management-jobs.yaml +++ b/jjb/ci-management/ci-management-jobs.yaml @@ -80,8 +80,10 @@ branch: '{branch}' builders: - - shell: - !include-raw-escape: include-raw-jjb-update.sh + - shell: | + pip freeze + jenkins-jobs --version + jenkins-jobs update --recursive --delete-old --workers 4 jjb/ - job-template: name: ci-management-verify-zuul diff --git a/jjb/ci-management/include-raw-jjb-update.sh b/jjb/ci-management/include-raw-jjb-update.sh deleted file mode 100644 index 1a06ecef9..000000000 --- a/jjb/ci-management/include-raw-jjb-update.sh +++ /dev/null @@ -1,10 +0,0 @@ -jenkins-jobs update --recursive --delete-old --workers 4 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 |