X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fnonrtric%2Fnonrtric.yaml;h=9746c9b43fbef399b252b88415f426dbffea98fa;hb=85e1bc056dd5ad3ff254edc88aaeca425fa8b91a;hp=1d69409ab40365416c5e86c79c804b8d024ed503;hpb=ba9bee2b417123113a6dd550c35d2cfd63339e6c;p=ci-management.git

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index 1d69409a..9746c9b4 100644
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -22,22 +22,14 @@
     # maven settings file has docker credentials
     mvn-settings: nonrtric-settings
     mvn-version: mvn36
-
-- nonrtric_jdk11: &nonrtric_jdk11
-    <<: *nonrtric_jdk_common
-    name: nonrtric-jdk11
     java-version: openjdk11
 
-- nonrtric_jdk8: &nonrtric_jdk8
-    <<: *nonrtric_jdk_common
-    name: nonrtric-jdk8
-    java-version: openjdk8
-
 - project:
-    <<: *nonrtric_jdk11
+    <<: *nonrtric_jdk_common
     mvn-params: -Dbuild.number=${{BUILD_NUMBER}}
     jobs:
-      - gerrit-maven-docker-verify
+      - gerrit-maven-docker-verify:
+          mvn-opts: -Dexec.skip=false
       - gerrit-maven-docker-merge
       - gerrit-maven-docker-stage
     stream:
@@ -47,10 +39,10 @@
 # nonrtric:policy-agent
 # Maven artifacts for nonrtric-policy-agent
 - project:
-    <<: *nonrtric_jdk11
+    <<: *nonrtric_jdk_common
     name: nonrtric-policy-agent
     project-name: '{name}'
-    mvn-opts: '-Ddocker.skip=true'
+    mvn-opts: '-Ddocker.skip=true -Dexec.skip=true'
     mvn-params: '-f policy-agent'
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
@@ -65,36 +57,17 @@
       - master:
           branch: master
 
-# nonrtric:sdnc-a1-controller-model
-# Maven artifacts for nonrtric-sdnc-a1-controller-model
+# nonrtric:sdnc-a1-controller
+# Maven artifacts for nonrtric-sdnc-a1-controller
 - project:
-    <<: *nonrtric_jdk8
-    name: nonrtric-sdnc-a1-controller-model
-    project-name: '{name}'
-    mvn-params: '-f sdnc-a1-controller/northbound/nonrt-ric-api/model'
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'sdnc-a1-controller/northbound/nonrt-ric-api/model/.*'
-    build-node: ubuntu1804-builder-4c-4g
-    jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge
-      - gerrit-maven-stage
-      - gerrit-maven-clm
-    stream:
-      - master:
-          branch: master
-
-# nonrtric:sdnc-a1-controller-provider
-# Maven artifacts for nonrtric-sdnc-a1-controller-provider
-- project:
-    <<: *nonrtric_jdk8
-    name: nonrtric-sdnc-a1-controller-provider
+    <<: *nonrtric_jdk_common
+    name: nonrtric-sdnc-a1-controller
     project-name: '{name}'
-    mvn-params: '-f sdnc-a1-controller/northbound/nonrt-ric-api/provider'
+    mvn-opts: '-Ddocker.skip=true -Dexec.skip=true'
+    mvn-params: '-f sdnc-a1-controller/northbound'
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'sdnc-a1-controller/northbound/nonrt-ric-api/provider/.*'
+        pattern: 'sdnc-a1-controller/northbound/.*'
     build-node: ubuntu1804-builder-4c-4g
     jobs:
       - gerrit-maven-verify
@@ -106,9 +79,8 @@
           branch: master
 
 - project:
-    <<: *nonrtric_jdk11
+    <<: *nonrtric_jdk_common
     name: nonrtric-release
-    branch: master
     # maven release requires sigul which requires centos
     # container release requires docker
     build-node: centos7-docker-2c-8g
@@ -116,10 +88,10 @@
       - '{project-name}-gerrit-release-jobs'
 
 - project:
-    <<: *nonrtric_jdk11
+    <<: *nonrtric_jdk_common
     name: nonrtric-sonar
     # template goal install builds docker image unnecessarily
-    mvn-params: -Ddocker.skip=true
+    mvn-params: '-Ddocker.skip=true -Dexec.skip=true'
     sonarcloud: true
     sonarcloud-api-token: '{sonarcloud_api_token}'
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'