X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fric-plt-a1%2Fric-plt-a1.yaml;h=1e8511f1ce234a6891353c86e2948851cb5d50e3;hb=a5a5bec19a85dbc2105c75b8d00d29d81d66fabd;hp=192eeaf8841e736fefc1b2302d1b82d729277945;hpb=70e3ed275e92f23ca83fbd20982f3cbcaa4e9ce8;p=ci-management.git

diff --git a/jjb/ric-plt-a1/ric-plt-a1.yaml b/jjb/ric-plt-a1/ric-plt-a1.yaml
index 192eeaf8..1e8511f1 100644
--- a/jjb/ric-plt-a1/ric-plt-a1.yaml
+++ b/jjb/ric-plt-a1/ric-plt-a1.yaml
@@ -5,44 +5,63 @@
     views:
       - project-view
 
+- project:
+    name: ric-plt-a1-info
+    project: ric-plt/a1
+    project-name: ric-plt-a1
+    build-node: centos7-builder-1c-1g
+    jobs:
+      - gerrit-info-yaml-verify
+
 - a1_docker_common: &a1_docker_common
-    # values apply to all RIC docker-build projects.
-    # factored out in case a1 needs multiple projects.
-    # use a specific name to prevent reuse attempts
-    # bcos anchors don't cross document boundaries.
+    # values apply to all A1 docker projects
     name: a1-docker-common
-    build-node: ubuntu1804-docker-4c-4g
-    # pull from the public mirror + releases registry
-    container-public-registry: nexus3.o-ran-sc.org:10001
-    # push to the staging repo bcos all builds are RCs
-    container-push-registry:  nexus3.o-ran-sc.org:10004
+    # git repo
+    project: ric-plt/a1
+    # jenkins job name prefix
+    project-name: ric-plt-a1
+    # maven settings file has docker credentials
+    mvn-settings: ric-plt-a1-settings
+
+- project:
+    <<: *a1_docker_common
+    name: ric-plt-a1
+    # image name
+    docker-name: '{name}'
+    # source of docker tag
+    container-tag-method: yaml-file
     # use host network to clone from our gerrit
     docker-build-args: '--network=host'
-    # source of docker tag
-    docker-use-params-from: yaml-file-params
     stream:
       - master:
           branch: master
+    jobs:
+      - gerrit-python-xc-clm
+      - '{project-name}-gerrit-docker-jobs'
 
+# runs unit tests on verify only
 - project:
-    name: ric-plt-a1
-    # git repo
-    project: ric-plt/a1
-    # jenkins job name prefix
-    project-name: '{name}'
-    # image name
+    <<: *a1_docker_common
+    name: ric-plt-a1-test
+    project-name: ric-plt-a1-test
+    # image name, but is never pushed
     docker-name: '{name}'
-    # maven settings file has docker credentials
-    mvn-settings: ric-plt-a1-settings
+    # source of docker tag
+    container-tag-method: latest
+    docker-build-args: '-f Dockerfile-Unit-Test'
+    stream:
+      - master:
+          branch: master
     jobs:
-      - '{project-name}-gerrit-docker-jobs'
-    <<: *a1_docker_common
+      - gerrit-docker-verify
 
 - project:
-    name: ric-plt-a1-info
-    project: ric-plt/a1
-    project-name: ric-plt-a1
-    build-node: centos7-builder-1c-1g
-
+    <<: *a1_docker_common
+    name: ric-plt-a1-sonar
+    branch: master
+    sonarcloud: true
+    sonarcloud-project-key: o-ran-sc_ric-plt-a1
+    sonarcloud-project-organization: o-ran-sc
+    sonarcloud-api-token: d9e23c28dc39b6d7531d2ecabf122ce84e6253ef
     jobs:
-      - gerrit-info-yaml-verify
+      - gerrit-tox-sonar