Remove jjb-update.sh script

The jjb-update.sh script was used by ODL when they had a custom
abstraction layer ontop of JJB for further customizing job templates.
This is no longer used in ODL and FD.io never had any custom JJB
scripting layer to begin with so this script is actually an unnecessary
additional process being run, remove it.

Also improve the merge job to print out python library versions and
jenkins-jobs version for troubleshooting.

Change-Id: I2e174747601c3ea31b1f5912ac56815bd73b3ae2
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml
index ddef5ee..226d77f 100644 (file)
--- 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 (file)
index 1a06ece..0000000
--- 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