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