X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fonap%2Fuds%2Fuds-daily-build-package-promote.yaml;h=ed05cfe86c4f6432a1af0a06b96a292ee0b0a8f3;hb=bf7ab7f6b5c2ab5411d2cb1c8d98cc4384acddf3;hp=95f07687a6b483ccac65f82244859abfa7faf71f;hpb=ed8ea73667d9e5820124d006bfe0b6858fa0cfff;p=infra%2Fcicd.git

diff --git a/jjb/onap/uds/uds-daily-build-package-promote.yaml b/jjb/onap/uds/uds-daily-build-package-promote.yaml
index 95f07687..ed05cfe8 100644
--- a/jjb/onap/uds/uds-daily-build-package-promote.yaml
+++ b/jjb/onap/uds/uds-daily-build-package-promote.yaml
@@ -18,13 +18,16 @@
 ---
 - project:
     name: 'uds-daily-build-package-promote'
-    projects: 'onap/sdc, local/onap/uds/sdc-customization'
+    projects: 'onap/sdc local/onap/uds/sdc-customization'
     project-name:
       - uds
-    branches: 20.2, master
-    project_directories: sdc, sdc-customization
+    branches: 20.2 master
+    project_directories: sdc sdc-customization
     project_versions:
+    mvn_params: '-DskipTests -Pdocker'
+    # mvn_params: '-DskipTests -Pdocker' # re-enable when unit tests pass
     mvn_settings_xml_version:
+    mvn_version: '3.6.0'
     docker_images: '
       uds/sdc-cassandra-init,
       uds/sdc-backend-init,
@@ -68,6 +71,9 @@
     project-type: 'multijob'
     workspace: '{workspace}'
     node: '{node}'
+    properties:
+      - logrotate
+
     parameters:
       - multi-project-parameters:
           projects: '{projects}'
@@ -76,7 +82,9 @@
           project_versions: '{project_versions}'
       - git-parameters
       - maven-parameters:
+          mvn_params: '{mvn_params}'
           mvn_settings_xml_version: '{mvn_settings_xml_version}'
+          mvn_version: '{mvn_version}'
       - artifact_parameters:
           artifact_paths: '{artifact_paths}'
           artifactory_artifact_path: '{artifactory_artifact_path}'
@@ -154,6 +162,24 @@
               property-file: $WORKSPACE/build.properties
     triggers:
       - timed: "@midnight"
+      - gerrit:
+          server-name: 'Nordix Gerrit'
+          trigger-on:
+            - change-merged-event
+            - comment-added-contains-event:
+                comment-contains-value: 'remerge'
+          projects:
+            - project-compare-type: 'PLAIN'
+              project-pattern: 'onap/sdc'
+              branches:
+                - branch-compare-type: 'PLAIN'
+                  branch-pattern: '20.2'
+            - project-compare-type: 'PLAIN'
+              project-pattern: 'local/onap/uds/sdc-customization'
+              branches:
+                - branch-compare-type: 'PLAIN'
+                  branch-pattern: 'master'
+
     wrappers:
       - openstack:
           single-use: True