X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Facumos%2Fglobal-templates-acumos-rebase.yaml;h=29865cfa7fbf36ba7dd78f9b362a5754b611dc71;hb=4926d1c13e51b8ff20871b309821be2aaa69d675;hp=e26e872eacb2d6598305a673335532be6b1210e1;hpb=4f29b8394ee11e5affba4f682d26388dc6bf8f74;p=infra%2Fcicd.git

diff --git a/jjb/acumos/global-templates-acumos-rebase.yaml b/jjb/acumos/global-templates-acumos-rebase.yaml
index e26e872e..29865cfa 100644
--- a/jjb/acumos/global-templates-acumos-rebase.yaml
+++ b/jjb/acumos/global-templates-acumos-rebase.yaml
@@ -1,7 +1,7 @@
 - job-template:
-    name: 'acumos-{project-name}-{stream}-rebase'
+    name: 'acumos-{project-name}-rebase'
 
-    node: infra-build01-ubuntu1804
+    node: infra-ubuntu1804
 
     disabled: false
 
@@ -11,9 +11,6 @@
       - logrotate
 
     parameters:
-      - project-parameters:
-          project: '{project}'
-          branch: '{branch}'
       - acumos-gerrit-parameters
       - string:
           name: NORDIX_REMOTE
@@ -23,13 +20,15 @@
     scm:
       - git-scm:
           ssh-credentials-id: nordixinfra-lfn-gerrit-ssh
-          branch: '{branch}'
+          branch: 'master'
           refspec: ''
+          wipe_workspace: false
+          clean_before: true
 
     triggers:
       - acumos-gerrit-trigger-change-merged:
           project: '{project}'
-          branch: '{branch}'
+          branch: '**'
           files: '**'
       - timed: "@midnight"
 
@@ -39,8 +38,8 @@
 
     builders:
       - shell:
-          !include-raw-escape: ../global/rebase-jobs.sh
+          !include-raw-escape: ./rebase-jobs.sh
 
     publishers:
       - notify-slack:
-          slack-channel: '#acumos'
+          slack-channel: '#infra'