Merge "Chore: Automation adds aiml-fw/athp/data-extraction config files"

[ci-management.git] / jjb / nonrtric-plt-dmaapadapter / nonrtric-plt-dmaapadapter.yaml

diff --git a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
index 73e30be..e6ed20f 100644 (file)
--- a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
+++ b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
@@ -34,6 +34,25 @@
     stream:
       - master:
           branch: master
+      - f-release:
+          branch: f-release
+
+# nonrtric:dmaapadapter/
+# Maven artifacts for nonrtric-plt-dmaapadapter/
+- project:
+    <<: *dmaapadapter_jdk_common
+    name: nonrtric-plt-dmaapadapter
+    project-name: '{name}'
+    mvn-opts: '-Ddocker.skip=true'
+    build-node: ubuntu1804-builder-4c-4g
+    jobs:
+      - gerrit-maven-stage
+      - gerrit-maven-clm
+    stream:
+      - master:
+          branch: master
+      - f-release:
+          branch: f-release
 
 - project:
     <<: *dmaapadapter_jdk_common
@@ -47,12 +66,12 @@
 - project:
     <<: *dmaapadapter_jdk_common
     name: nonrtric-plt-dmaapadapter-sonar
-    project-name: '{name}'
+    project-name: nonrtric-plt-dmaapadapter
     # template goal install builds docker image unnecessarily
     mvn-params: '-Ddocker.skip=true'
     sonarcloud: true
     sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_nonrtric-plt-dmaapadapter'
+    sonarcloud-project-key: 'nonrtric-plt-dmaapadapter'
     sonarcloud-project-organization: '{sonarcloud_project_organization}'
     jobs:
       - gerrit-maven-sonar