Merge "Automation adds ric-app-rc.yaml"

[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 91bf749..f19d1f3 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
@@ -50,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:
@@ -57,6 +50,10 @@
     stream:
       - master:
           branch: master
+      - dawn:
+          branch: dawn
+      - e-release:
+          branch: e-release
 
 - project:
     <<: *portal_nonrtric_controlpanel_common
@@ -81,9 +78,9 @@
 
 - project:
     <<: *portal_nonrtric_controlpanel_common
-    name: nonrtric-controlpanel-gateway
+    name: portal-nonrtric-controlpanel-gateway
     project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
+    mvn-params: '-f nonrtric-gateway'
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
         pattern: 'nonrtric-gateway/.*'
@@ -95,4 +92,32 @@
       - gerrit-maven-clm
     stream:
       - master:
-          branch: master
\ No newline at end of file
+          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
+