2 files changed, 88 insertions, 0 deletions
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
new file mode 100644
index 00000000..ceb8df83
--- /dev/null
+++ b/jjb/ci-management/ci-management.yaml
@@ -0,0 +1,78 @@
+---
+- project:
+    name: ci-management-jobs
+    jobs:
+      - 'ci-management-verify-jjb'
+      - 'ci-management-merge'
+
+    project: 'ci-management'
+    branch: master
+
+- job-template:
+    name: ci-management-verify-jjb
+
+    project-type: freestyle
+    node: master
+    concurrent: true
+
+    parameters:
+      - agl-infra-parameters:
+          project: '{project}'
+          branch: 'master'
+          refspec: 'refs/heads/master'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+
+    wrappers:
+      - ssh-agent-credentials:
+          users:
+              - '{ssh-credentials}'
+
+    triggers:
+        - gerrit-trigger-patch-submitted:
+            name: '{project}'
+            branch: '{branch}'
+
+    builders:
+      - shell: |
+          ls -alh ; jenkins-jobs test --recursive jjb/
+      - ci-management-check-unicode
+
+- job-template:
+    name: 'ci-management-merge'
+
+    project-type: freestyle
+    node: master
+
+    build-discarder:
+      days-to-keep: 30
+      num-to-keep: 40
+      artifact-days-to-keep: -1
+      artifact-num-to-keep: 5
+
+    parameters:
+      - agl-infra-parameters:
+          project: '{project}'
+          branch: 'master'
+          refspec: 'refs/heads/master'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+
+    wrappers:
+      - agl-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-patch-merged:
+            name: '{project}'
+            branch: '{branch}'
+
+    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 00000000..aca40dc6
--- /dev/null
+++ b/jjb/ci-management/include-raw-jjb-update.sh
@@ -0,0 +1,10 @@
+jenkins-jobs update --delete-old --recursive 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 39418 agl-jobbuilder@gerrit.automotievlinux.org.org:hooks/commit-msg ${gitdir}/hooks/
+git diff --exit-code || submitJJB