X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fonap%2Fglobal-templates-onap-rebase.yaml;h=180f851a28c884d1a24f5dae436078380d3a18bd;hb=refs%2Fchanges%2F40%2F13740%2F2;hp=6c297acbe59cdad21b00170b2060d51eeea512b1;hpb=7e507875f63896df2bfd2e3efe33da2a9521f6ad;p=infra%2Fcicd.git

diff --git a/jjb/onap/global-templates-onap-rebase.yaml b/jjb/onap/global-templates-onap-rebase.yaml
index 6c297acb..180f851a 100644
--- a/jjb/onap/global-templates-onap-rebase.yaml
+++ b/jjb/onap/global-templates-onap-rebase.yaml
@@ -1,20 +1,19 @@
 - job-template:
-    name: 'onap-{project-name}-{stream}-rebase'
-
-    node: infra-build01-ubuntu1804
-
+    name: 'onap-{project-name}-rebase'
+    node: infra-ubuntu2004
     disabled: false
-
     concurrent: false
 
     properties:
       - logrotate
+      - est-ms-teams-rebase-jobs-webhook
 
     parameters:
-      - project-parameters:
-          project: '{project}'
-          branch: '{branch}'
       - onap-gerrit-parameters
+      - string:
+          name: PROJECT
+          default: '{project}'
+          description: JJB configured PROJECT parameter to identify a Nordix Gerrit project
       - string:
           name: NORDIX_REMOTE
           default: 'ssh://infra@gerrit.nordix.org:29418/onap/{project}.git'
@@ -23,21 +22,24 @@
     scm:
       - git-scm:
           ssh-credentials-id: nordixinfra-lfn-gerrit-ssh
-          branch: '{branch}'
+          branch: 'master'
           refspec: ''
-          wipe_workspace: true
-          clean_before: false
+          wipe_workspace: false
+          clean_before: true
 
     triggers:
       - onap-gerrit-trigger-change-merged:
           project: '{project}'
-          branch: '{branch}'
+          branch: '**'
           files: '**'
       - timed: "@midnight"
 
     wrappers:
       - build-timeout:
           timeout: 10
+      - ssh-agent-credentials:
+          users:
+            - 'nordixinfra-nordix-gerrit-ssh'
 
     builders:
       - shell:
@@ -46,3 +48,7 @@
     publishers:
       - notify-slack:
           slack-channel: '#infra'
+          notify-start: false
+          notify-success: false
+          notify-failure: true
+          notify-back-to-normal: true