Merge "Update nonrtric jjb for the change of folder names in master branch"

diff --combined jjb/nonrtric/nonrtric.yaml
index f010d20,108d9e9..002bf1e
--- 1/jjb/nonrtric/nonrtric.yaml
--- 2/jjb/nonrtric/nonrtric.yaml
+++ b/jjb/nonrtric/nonrtric.yaml
@@@ -39,8 -39,8 +39,8 @@@
        - dawn:
            branch: dawn
  
- # nonrtric:a1-policy-management-service/
- # Maven artifacts for nonrtric-a1-policy-management-service/
+ # nonrtric:a1-policy-management-service
+ # Maven artifacts for nonrtric-a1-policy-management-service
  - project:
      <<: *nonrtric_jdk_common
      name: nonrtric-a1-policy-management-service/
@@@ -59,6 -59,25 +59,25 @@@
      stream:
        - master:
            branch: master
+ 
+ # nonrtric:policy-agent
+ # Maven artifacts for nonrtric-policy-agent
+ - project:
+     <<: *nonrtric_jdk_common
+     name: nonrtric-policy-agent
+     project-name: '{name}'
+     mvn-opts: '-Ddocker.skip=true'
+     mvn-params: '-f policy-agent'
+     gerrit_trigger_file_paths:
+       - compare-type: REG_EXP
+         pattern: 'policy-agent/.*'
+     build-node: ubuntu1804-builder-4c-4g
+     jobs:
+       - gerrit-maven-verify
+       - gerrit-maven-merge
+       - gerrit-maven-stage
+       - gerrit-maven-clm
+     stream:
        - cherry:
            branch: cherry
        - dawn:
@@@ -109,6 -128,25 +128,25 @@@
      stream:
        - master:
            branch: master
+ 
+ # nonrtric:enrichment-coordinator-service
+ # Maven artifacts for nonrtric-enrichment-coordinator-service
+ - project:
+     <<: *nonrtric_jdk_common
+     name: nonrtric-enrichment-coordinator-service
+     project-name: '{name}'
+     mvn-opts: '-Ddocker.skip=true'
+     mvn-params: '-f enrichment-coordinator-service'
+     gerrit_trigger_file_paths:
+       - compare-type: REG_EXP
+         pattern: 'enrichment-coordinator-service/.*'
+     build-node: ubuntu1804-builder-4c-4g
+     jobs:
+       - gerrit-maven-verify
+       - gerrit-maven-merge
+       - gerrit-maven-stage
+       - gerrit-maven-clm
+     stream:
        - cherry:
            branch: cherry
        - dawn:
@@@ -165,6 -203,30 +203,6 @@@
        - dawn:
            branch: dawn
  
 -- project:
 -    <<: *nonrtric_jdk_common
 -    name: nonrtric-dmaap-mediator-producer
 -    project-name: '{name}'
 -    # image name
 -    docker-name: 'o-ran-sc/nonrtric-dmaap-mediator-producer'
 -    # get tag from YAML
 -    container-tag-method: yaml-file
 -    # use host network to clone from our gerrit
 -    docker-build-args: '--network=host'
 -    # Directory with Dockerfile
 -    docker-root: 'dmaap-mediator-producer'
 -    # Limit build trigger to appropriate files
 -    gerrit_trigger_file_paths:
 -      - compare-type: REG_EXP
 -        pattern: 'dmaap-mediator-producer/.*'
 -    build-node: ubuntu1804-docker-4c-4g
 -    # Includes verify and merge jobs
 -    jobs:
 -      - "{project-name}-gerrit-docker-jobs"
 -    stream:
 -      - master:
 -          branch: master
 -
  - project:
      <<: *nonrtric_jdk_common
      name: nonrtric-o-ru-closed-loop-consumer