OpenDaylight: Improve jenkins jobs for OpenDaylight projects

[infra/cicd.git] / jjb / opendaylight / global-templates-opendaylight-rebase.yaml

diff --git a/jjb/opendaylight/global-templates-opendaylight-rebase.yaml b/jjb/opendaylight/global-templates-opendaylight-rebase.yaml
index f7dab86c1bef532c7f8ee6b1dfc8a5f03fa4bfe1..e6921391aa951df8511c90aa85a350d2cd64db8c 100644 (file)
--- a/jjb/opendaylight/global-templates-opendaylight-rebase.yaml
+++ b/jjb/opendaylight/global-templates-opendaylight-rebase.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'opendaylight-{project-name}-{stream}-rebase'
+    name: 'opendaylight-{project-name}-rebase'
 
     node: infra-ubuntu1804
 
@@ -11,9 +11,6 @@
       - logrotate
 
     parameters:
-      - project-parameters:
-          project: '{project}'
-          branch: '{branch}'
       - odl-gerrit-parameters
       - string:
           name: NORDIX_REMOTE
@@ -23,15 +20,15 @@
     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:
       - odl-gerrit-trigger-change-merged:
           project: '{project}'
-          branch: '{branch}'
+          branch: '**'
           files: '**'
       - timed: "@midnight"
 
@@ -41,7 +38,7 @@
 
     builders:
       - shell:
-          !include-raw-escape: ../global/rebase-jobs.sh
+          !include-raw-escape: ./rebase-jobs.sh
 
     publishers:
       - notify-slack: