Remove custom scripting from builder-merge job

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

diff --git a/jjb/include-raw-jjb-update.sh b/jjb/include-raw-jjb-update.sh
deleted file mode 100644 (file)
index 878904a..0000000
--- a/jjb/include-raw-jjb-update.sh
+++ /dev/null
@@ -1,11 +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 jenkins-releng@git.opendaylight.org:hooks/commit-msg ${gitdir}/hooks/
-python scripts/jjb-autoupdate-project.py
-git diff --exit-code || submitJJB

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 6b406196d4a1fec71e92aa2956ca607e1fbf56f0..0bc6debb05684e7af98f4981e1ff5d007339af5d 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -189,9 +189,9 @@
                       pattern: jjb-templates/**
 
     builders:
-        - shell:
-            !include-raw-escape:
-                - include-raw-jjb-update.sh
+        - shell: |
+            jenkins-jobs --version
+            jenkins-jobs update --recursive --delete-old --workers 4 jjb/
 
     publishers:
         - email-notification: