X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fportal-nonrtric-controlpanel%2Fportal-nonrtric-controlpanel.yaml;h=f19d1f3f308f2b015129945bf18ab8efc93d285e;hb=e184da654eefe331b600896a964095e6f59cdeaf;hp=9eb74f81d3d3cddb457f31b25dde2fc578fe99da;hpb=e949b03b3cc88eed1a9ac01648484c4fcab224c5;p=ci-management.git

diff --git a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
index 9eb74f81..f19d1f3f 100644
--- a/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
+++ b/jjb/portal-nonrtric-controlpanel/portal-nonrtric-controlpanel.yaml
@@ -26,19 +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
-
 - project:
     <<: *portal_nonrtric_controlpanel_common
     name: nonrtric-controlpanel-frontend
@@ -54,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:
@@ -61,6 +50,10 @@
     stream:
       - master:
           branch: master
+      - dawn:
+          branch: dawn
+      - e-release:
+          branch: e-release
 
 - project:
     <<: *portal_nonrtric_controlpanel_common
@@ -81,4 +74,50 @@
     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
+      - dawn:
+          branch: dawn
+      - e-release:
+          branch: e-release
+
+- 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/.*'
+      - compare-type: REG_EXP
+        pattern: 'docker-compose/.*'
+    build-node: ubuntu1804-docker-4c-4g
+    jobs:
+      - gerrit-maven-docker-verify
+      - gerrit-maven-docker-merge
+      - gerrit-maven-docker-stage
+    stream:
+      - master:
+          branch: master
+      - dawn:
+          branch: dawn
+      - e-release:
+          branch: e-release
+