ONAP: Improve jenkins rebase and push-upstream jobs

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

diff --git a/jjb/onap/global-templates-onap-rebase.yaml b/jjb/onap/global-templates-onap-rebase.yaml
index 5345d745b71bbb0744fc19e4f7ed842f0c83ff6f..acb47909ab76f8a5f5d073dc5702541226bc9846 100644 (file)
--- a/jjb/onap/global-templates-onap-rebase.yaml
+++ b/jjb/onap/global-templates-onap-rebase.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'onap-{project-name}-{stream}-rebase'
+    name: 'onap-{project-name}-rebase'
 
     node: infra-ubuntu1804
 
@@ -11,10 +11,11 @@
       - logrotate
 
     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,15 +24,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:
       - onap-gerrit-trigger-change-merged:
           project: '{project}'
-          branch: '{branch}'
+          branch: '**'
           files: '**'
       - timed: "@midnight"
 
@@ -41,7 +42,7 @@
 
     builders:
       - shell:
-          !include-raw-escape: ../global/rebase-jobs.sh
+          !include-raw-escape: ./rebase-jobs.sh
 
     publishers:
       - notify-slack: