X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric-plt-dmaapadapter%2Fnonrtric-plt-dmaapadapter.yaml;h=4becabc8e93d5e75291461d0640e1983306f8360;hb=5167974d32e3ec5c80a2d3626690456ad79b0d0f;hp=73e30bef7cd0ec4f1318be68b1b17a401ecf115a;hpb=ffc81c3a672b3d64e27cfe318e91a60310388a8d;p=ci-management.git

diff --git a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
index 73e30bef..4becabc8 100644
--- a/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
+++ b/jjb/nonrtric-plt-dmaapadapter/nonrtric-plt-dmaapadapter.yaml
@@ -5,15 +5,7 @@
     views:
       - project-view
 
-- project:
-    name: nonrtric-plt-dmaapadapter-info
-    project: nonrtric/plt/dmaapadapter
-    project-name: nonrtric-plt-dmaapadapter
-    build-node: centos7-builder-1c-1g
-    jobs:
-      - gerrit-info-yaml-verify
-
-- dmaapadapter_jdk_common: &dmaapadapter_jdk_common
+- _dmaapadapter_jdk_common: &dmaapadapter_jdk_common
     name: dmaapadapter-jdk-common
     # git repo
     project: nonrtric/plt/dmaapadapter
@@ -22,7 +14,7 @@
     # maven settings file has docker credentials
     mvn-settings: nonrtric-plt-dmaapadapter-settings
     mvn-version: mvn36
-    java-version: openjdk11
+    java-version: openjdk17
 
 - project:
     <<: *dmaapadapter_jdk_common
@@ -34,25 +26,41 @@
     stream:
       - master:
           branch: master
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
+      - h-release:
+          branch: h-release
+      - i-release:
+          branch: i-release
 
+# nonrtric:dmaapadapter/
+# Maven artifacts for nonrtric-plt-dmaapadapter/
 - project:
     <<: *dmaapadapter_jdk_common
-    name: nonrtric-plt-dmaapadapter-release
-    # maven release requires sigul which requires centos
-    # container release requires docker
-    build-node: centos7-docker-2c-8g
+    name: nonrtric-plt-dmaapadapter
+    project-name: "{name}"
+    mvn-opts: "-Ddocker.skip=true"
+    build-node: ubuntu1804-builder-4c-4g
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - gerrit-maven-stage
+      - gerrit-maven-clm
+    stream:
+      - master:
+          branch: master
+      - g-release:
+          java-version: openjdk11
+          branch: g-release
+      - h-release:
+          branch: h-release
+      - i-release:
+          branch: i-release
 
 - project:
     <<: *dmaapadapter_jdk_common
-    name: nonrtric-plt-dmaapadapter-sonar
-    project-name: '{name}'
-    # 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-organization: '{sonarcloud_project_organization}'
+    name: nonrtric-plt-dmaapadapter-release
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
     jobs:
-      - gerrit-maven-sonar
+      - "{project-name}-gerrit-release-jobs"