X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fopendaylight%2Fglobal-templates-opendaylight-rebase.yaml;h=1d3d403f1fb6712e2c8675583d36872aa492b0b7;hb=ff46d0a91c5351ff64574f48db1ebfa979ca868d;hp=b9ee8f0e041421a5f05834cc6a32443e85b79123;hpb=a9b3ba6f2745e10b8e91ef61dc7181eddf74c830;p=infra%2Fcicd.git

diff --git a/jjb/opendaylight/global-templates-opendaylight-rebase.yaml b/jjb/opendaylight/global-templates-opendaylight-rebase.yaml
index b9ee8f0e..1d3d403f 100644
--- a/jjb/opendaylight/global-templates-opendaylight-rebase.yaml
+++ b/jjb/opendaylight/global-templates-opendaylight-rebase.yaml
@@ -1,7 +1,7 @@
 - job-template:
-    name: 'opendaylight-{project-name}-{stream}-rebase'
+    name: 'opendaylight-{project-name}-rebase'
 
-    node: infra-build01-ubuntu1804
+    node: infra-ubuntu1804
 
     disabled: false
 
@@ -11,10 +11,11 @@
       - logrotate
 
     parameters:
-      - project-parameters:
-          project: '{project}'
-          branch: '{branch}'
       - odl-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/opendaylight/{project}.git'
@@ -23,13 +24,15 @@
     scm:
       - git-scm:
           ssh-credentials-id: nordixinfra-lfn-gerrit-ssh
-          branch: '{branch}'
+          branch: 'master'
           refspec: ''
+          wipe_workspace: false
+          clean_before: true
 
     triggers:
       - odl-gerrit-trigger-change-merged:
           project: '{project}'
-          branch: '{branch}'
+          branch: '**'
           files: '**'
       - timed: "@midnight"
 
@@ -39,7 +42,7 @@
 
     builders:
       - shell:
-          !include-raw-escape: ../global/rebase-jobs.sh
+          !include-raw-escape: ./rebase-jobs.sh
 
     publishers:
       - notify-slack: