Merge "add merge job"

[ci-management.git] / jjb / portal-nonrtric-controlpanel / portal-nonrtric-controlpanel.yaml

diff --git a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
index e5c3fe2..26299a1 100644 (file)
--- a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
+++ b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
@@ -26,21 +26,6 @@
     java-version: openjdk11
     mvn-version: mvn36
 
-- project:
-    <<: *portal_nonrtric_controlpanel_common
-    mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
-    # do not trigger on changes in directory webapp-frontend/
-    gerrit_trigger_file_paths:
-        - compare-type: REG_EXP
-          pattern: '^((?!webapp-frontend\/|\/COMMIT_MSG).)*$'
-    jobs:
-      - "{project-name}-gerrit-maven-docker-jobs"
-    stream:
-      - master:
-          branch: master
-      - cherry:
-          branch: cherry
-
 - project:
     <<: *portal_nonrtric_controlpanel_common
     name: nonrtric-controlpanel-frontend
@@ -56,6 +41,8 @@
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: 'webapp-frontend/.*'
+      - compare-type: REG_EXP
+        pattern: 'docker-compose/.*'
     build-node: ubuntu1804-docker-4c-4g
     # Includes verify and merge jobs
     jobs:
@@ -89,6 +76,7 @@
     <<: *portal_nonrtric_controlpanel_common
     name: portal-nonrtric-controlpanel-gateway
     project-name: '{name}'
+    mvn-params: '-f nonrtric-gateway'
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: 'nonrtric-gateway/.*'
@@ -106,9 +94,12 @@
     <<: *portal_nonrtric_controlpanel_common
     name: portal-nonrtric-controlpanel-gateway-docker
     project-name: '{name}'
+    mvn-params: '-P docker -f nonrtric-gateway'
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: 'nonrtric-gateway/.*'
+      - compare-type: REG_EXP
+        pattern: 'docker-compose/.*'
     build-node: ubuntu1804-docker-4c-4g
     jobs:
       - gerrit-maven-docker-verify