commit be2809101179fd828a7c0b9de606b1e479c10064
author matthew-mcneilly <matthew.mcneilly@est.tech> Thu Jul 30 15:36:38 2020 +0100
committer matthew-mcneilly <matthew.mcneilly@est.tech> Fri Jul 31 09:26:50 2020 +0100
tree 1cde1f26bc540de1df9c665281dc1debf684c009
parent 5e47a57d9047f3c56ba770538bc5afa9e8687ffd

Add triggers to UDS Build Job

Added triggers when changes merged into sdc and sdc-custom repos
Skip unit tests in build by default until these pass
Follow on change for
https://gerrit.nordix.org/#/c/infra/cicd/+/5154/

Signed-off-by: matthew-mcneilly <matthew.mcneilly@est.tech>
Change-Id: I251e171f6f20ab4819b00b17b757ab7104de64bf

jjb/onap/uds/uds-daily-build-package-promote.yaml

diff --git a/jjb/onap/uds/uds-daily-build-package-promote.yaml b/jjb/onap/uds/uds-daily-build-package-promote.yaml
index 95f0768..abb6020 100644
--- a/jjb/onap/uds/uds-daily-build-package-promote.yaml
+++ b/jjb/onap/uds/uds-daily-build-package-promote.yaml
@@ -24,6 +24,8 @@
     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:
     docker_images: '
       uds/sdc-cassandra-init,
@@ -76,6 +78,7 @@
           project_versions: '{project_versions}'
       - git-parameters
       - maven-parameters:
+          mvn_params: '{mvn_params}'
           mvn_settings_xml_version: '{mvn_settings_xml_version}'
       - artifact_parameters:
           artifact_paths: '{artifact_paths}'
@@ -154,6 +157,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

jjb/onap/uds/uds-macros.yaml

diff --git a/jjb/onap/uds/uds-macros.yaml b/jjb/onap/uds/uds-macros.yaml
index 802643b..186f691 100644
--- a/jjb/onap/uds/uds-macros.yaml
+++ b/jjb/onap/uds/uds-macros.yaml
@@ -70,7 +70,7 @@
           description: Path to mvn executable
       - string:
           name: MVN_PARAMS
-          default: -Pdocker
+          default: '{mvn_params}'
           description: Maven build parameters
       - string:
           name: MVN_SETTINGS_XML_VERSION