Merge "[DCAE] Fix verify jobs trigger overlap"

3 files changed, 25 insertions, 14 deletions

diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
index 4b35e7695..7ec404351 100644
--- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: dcaegen2-services-datalake-handler-verify-merge
+    name: dcaegen2-services-datalake-handler
     project: 'dcaegen2/services'
     project-name: 'dcaegen2-services-datalake-handler'
     jobs:
@@ -20,7 +20,9 @@
     container-public-registry: 'nexus3.onap.org:10001'
     container-staging-registry: 'nexus3.onap.org:10003'
     mvn-params: '-f components/datalake-handler/pom.xml'
-    pattern: 'components/datalake-handler/**'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'components/datalake-handler/**'
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
     maven-deploy-properties: |
@@ -43,13 +45,11 @@
           mvn-pom: 'components/datalake-handler/pom.xml'
           mvn-params: '-f components/datalake-handler/pom.xml'
           version-properties-file: 'components/datalake-handler/version.properties'
-          pattern: 'components/datalake-handler/**'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/feeder/pom.xml'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-          pattern: 'components/datalake-handler/**'
     stream:
       - 'master':
          branch: 'master'
@@ -58,6 +58,9 @@
       - 'jakarta':
           branch: 'jakarta'
     java-version: openjdk11
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'components/datalake-handler/feeder/**'
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
@@ -79,13 +82,11 @@
           mvn-pom: 'components/datalake-handler/pom.xml'
           mvn-params: '-f components/datalake-handler/pom.xml'
           version-properties-file: 'components/datalake-handler/version.properties'
-          pattern: 'components/datalake-handler/**'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/admin/pom.xml'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-          pattern: 'components/datalake-handler/**'
     stream:
       - 'master':
           branch: 'master'
@@ -94,6 +95,9 @@
       - 'jakarta':
           branch: 'jakarta'
     java-version: openjdk11
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'components/datalake-handler/admin/**'
     mvn-settings: 'dcaegen2-services-settings'
     maven-deploy-properties: |
       deployAtEnd=true
@@ -115,13 +119,11 @@
           mvn-pom: 'components/datalake-handler/pom.xml'
           mvn-params: '-f components/datalake-handler/pom.xml'
           version-properties-file: 'components/datalake-handler/version.properties'
-          pattern: 'components/datalake-handler/**'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/des/pom.xml'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
-          pattern: 'components/datalake-handler/**'
     stream:
       - 'master':
          branch: 'master'
@@ -134,6 +136,9 @@
     maven-deploy-properties: |
       deployAtEnd=true
     files: '**'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'components/datalake-handler/des/**'
     archive-artifacts: ''
     build-node: 'ubuntu1804-docker-8c-8g'
 
diff --git a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
index df5560fbe..33cb078cb 100644
--- a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml
@@ -23,7 +23,9 @@
     container-staging-registry: 'nexus3.onap.org:10003'
     mvn-goals: 'clean package docker:build'
     mvn-params: '-f components/kpi-computation-ms/pom.xml'
-    pattern: 'components/kpi-computation-ms/**'
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'components/kpi-computation-ms/**'
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
     maven-deploy-properties: |
@@ -42,14 +44,12 @@
           maven-versions-plugin: true
           mvn-pom: 'components/kpi-computation-ms/pom.xml'
           mvn-params: '-f components/kpi-computation-ms/pom.xml'
-          pattern: 'components/kpi-computation-ms/**'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-goals: 'clean package docker:build -DpushImageTag'
           mvn-params: '-f components/kpi-computation-ms/pom.xml'
-          pattern: 'components/kpi-computation-ms/**'
     stream:
       - 'master':
           branch: 'master'
@@ -57,6 +57,9 @@
     mvn-settings: 'dcaegen2-services-settings'
     files: '**'
     archive-artifacts: ''
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'components/kpi-computation-ms/**'
     build-node: 'ubuntu1804-docker-8c-8g'
     maven-deploy-properties: |
       deployAtEnd=true
diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
index aed1f2abc..6992d4b83 100644
--- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml
@@ -19,7 +19,9 @@
     container-public-registry: 'nexus3.onap.org:10001'
     container-staging-registry: 'nexus3.onap.org:10003'
     mvn-params: '-f components/slice-analysis-ms/pom.xml'
-    pattern: 'components/slice-analysis-ms/**'
+    gerrit_trigger_file_paths: 
+      - compare-type: REG_EXP
+        pattern: 'components/slice-analysis-ms/**'
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
     files: '**'
@@ -41,14 +43,12 @@
           maven-versions-plugin: true
           mvn-pom: 'components/slice-analysis-ms/pom.xml'
           mvn-params: '-f components/slice-analysis-ms/pom.xml'
-          pattern: 'components/slice-analysis-ms/**'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-goals: 'clean package docker:build -DpushImageTag'
           mvn-params: '-f components/slice-analysis-ms/pom.xml'
-          pattern: 'components/slice-analysis-ms/**'
     stream:
       - 'master':
           branch: 'master'
@@ -56,6 +56,9 @@
     mvn-settings: 'dcaegen2-services-settings'
     files: '**'
     archive-artifacts: ''
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'components/slice-analysis-ms/**'
     build-node: 'ubuntu1804-docker-8c-8g'
     maven-deploy-properties: |
       deployAtEnd=true