X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fglobal%2Fglobal-templates-rebase.yaml;h=a76dfaafcc7d1ab3d67a50374abf57adb7af92de;hb=ec267334bac7beb410fd7e219c71d6fa95453212;hp=19c3af7102e51744aa03727528f97d8828bb850b;hpb=4f908e58fd81cab916147fe92c291b48ef64042a;p=infra%2Fcicd.git

diff --git a/jjb/global/global-templates-rebase.yaml b/jjb/global/global-templates-rebase.yaml
index 19c3af71..a76dfaaf 100644
--- a/jjb/global/global-templates-rebase.yaml
+++ b/jjb/global/global-templates-rebase.yaml
@@ -1,12 +1,15 @@
 - job-template:
     name: '{project-name}-{stream}-rebase'
 
-    node: ubuntu1804
+    node: infra-build01-ubuntu1804
 
     disabled: false
 
     concurrent: false
 
+    properties:
+      - logrotate
+
     parameters:
       - project-parameters:
           project: '{project}'
@@ -16,23 +19,27 @@
           name: NORDIX_REMOTE
           default: 'ssh://infra@gerrit.nordix.org:29418/{project}.git'
           description: The remote to add for Nordix.
-      - string:
-          name: UPSTREAM_BRANCH
-          default: '{upstream-branch}'
-          description: The upstream branch to rebase against.
 
     scm:
       - git-scm:
           ssh-credentials-id: nordixinfra-lfn-gerrit-ssh
-          branch: "$UPSTREAM_BRANCH"
+          branch: '{branch}'
           refspec: ''
 
     triggers:
       - onap-gerrit-trigger-change-merged:
           project: '{project}'
-          branch: "$UPSTREAM_BRANCH"
+          branch: '{branch}'
           files: '**'
 
+    wrappers:
+      - build-timeout:
+          timeout: 10
+
     builders:
       - shell:
           !include-raw-escape: ./rebase-jobs.sh
+
+    publishers:
+      - notify-slack:
+          slack-channel: '#infra'