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

diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml
index 1d69409a..3dec5a44 100644
--- a/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@ -35,9 +35,11 @@
 
 - project:
     <<: *nonrtric_jdk11
+    mvn-opts: -Dexec.skip=true
     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:
@@ -50,7 +52,7 @@
     <<: *nonrtric_jdk11
     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 +67,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
+    name: nonrtric-sdnc-a1-controller
     project-name: '{name}'
-    mvn-params: '-f sdnc-a1-controller/northbound/nonrt-ric-api/model'
+    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/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
-    project-name: '{name}'
-    mvn-params: '-f sdnc-a1-controller/northbound/nonrt-ric-api/provider'
-    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
@@ -119,7 +102,7 @@
     <<: *nonrtric_jdk11
     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}'