X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fonap%2Fuds%2Fuds-daily-build-package-promote.yaml;h=f4a8c9dca8827ab827cee0caedeca283dd0a045f;hb=31d5df55c6b5ac04c67106a082361cc2359359ef;hp=75efb3b3c6571c4d88614bc96096441479affec4;hpb=fa60fdc2ece2dfddc34e0391841bc1f27520f00f;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 75efb3b3..f4a8c9dc 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.3 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,
@@ -40,7 +43,7 @@
     '
     docker_image_artifact_directory: $WORKSPACE/artifacts/images
     artifactory_docker_images_path: onap/uds/images
-    artifact_paths: 'sdc/catalog-be/target/catalog-be-*.war'
+    artifact_paths: 'sdc/catalog-be/target/catalog-be.war'
     artifactory_artifact_path: onap/uds
     artifact_directory: $WORKSPACE/artifacts/artifacts
     artifactory_repo_archive_path: onap/uds/releases
@@ -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,14 +162,28 @@
               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
-      - credentials-binding:
-        - username-password-separated:
-            credential-id: infra-nordix-artifactory-api-key
-            username: ARTIFACTORY_USER
-            password: ARTIFACTORY_API_KEY
+
 
 - job-template:
     name: '{project-name}-build'
@@ -212,6 +234,9 @@
 
     builders:
       - 'promote-file-artifacts-to-artifactory'
+    wrappers:
+      - 'artifactory-credentials'
+
 
 - job-template:
     name: '{project-name}-promote-images'
@@ -221,6 +246,9 @@
 
     builders:
       - 'promote-docker-images-to-artifactory'
+    wrappers:
+      - 'artifactory-credentials'
+
 
 - job-template:
     name: '{project-name}-promote-repositories'
@@ -230,3 +258,5 @@
 
     builders:
       - 'promote-source-repositories-to-artifactory'
+    wrappers:
+      - 'artifactory-credentials'