Fix oam-nf-oam-adopter-maven-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 93d22db..631fad6 100644 (file)
--- a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
+++ b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
@@ -26,15 +26,6 @@
     java-version: openjdk11
     mvn-version: mvn36
 
-- project:
-    <<: *portal_nonrtric_controlpanel_common
-    mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
-    jobs:
-      - "{project-name}-gerrit-maven-docker-jobs"
-    stream:
-      - master:
-          branch: master
-
 - project:
     <<: *portal_nonrtric_controlpanel_common
     name: nonrtric-controlpanel-frontend
@@ -77,4 +68,39 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     jobs:
-      - gerrit-maven-sonar
\ No newline at end of file
+      - gerrit-maven-sonar
+
+- project:
+    <<: *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/.*'
+    build-node: ubuntu1804-builder-4c-4g
+    jobs:
+      - gerrit-maven-verify
+      - gerrit-maven-merge
+      - gerrit-maven-stage
+      - gerrit-maven-clm
+    stream:
+      - master:
+          branch: master
+
+- project:
+    <<: *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/.*'
+    build-node: ubuntu1804-docker-4c-4g
+    jobs:
+      - gerrit-maven-docker-verify
+      - gerrit-maven-docker-merge
+      - gerrit-maven-docker-stage
+    stream:
+      - master:
+          branch: master