X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fric-plt-a1%2Fric-plt-a1.yaml;h=aa8309619a249eb4eb475b14d450e78d972160a6;hb=aa7f783e20194fb586c2474ecfef9e0f40ee9b67;hp=41cf248c12f8c8ffc5c81d533ed16d0d0985055d;hpb=8a4f190afa328ea560c1e391362b6f2f974e0019;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 41cf248c..aa830961 100644
--- a/jjb/ric-plt-a1/ric-plt-a1.yaml
+++ b/jjb/ric-plt-a1/ric-plt-a1.yaml
@@ -5,44 +5,68 @@
     views:
       - project-view
 
-- 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.
-    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
-    # 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
-
 - project:
-    name: ric-plt-a1
+    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_common: &a1_common
+    # values apply to all A1 projects
+    name: a1-common
     # git repo
     project: ric-plt/a1
     # jenkins job name prefix
-    project-name: '{name}'
-    # image name
-    docker-name: '{name}'
+    project-name: ric-plt-a1
     # maven settings file has docker credentials
     mvn-settings: ric-plt-a1-settings
+
+- project:
+    <<: *a1_common
+    name: ric-plt-a1
+    # image name
+    docker-name: '{name}'
+    # source of docker tag
+    container-tag-method: yaml-file
+    # use host network
+    docker-build-args: '--network=host'
+    build-node: ubuntu1804-docker-4c-4g
+    stream:
+      - master:
+          branch: master
     jobs:
       - '{project-name}-gerrit-docker-jobs'
-    <<: *a1_docker_common
 
 - project:
-    name: ric-plt-a1-info
-    project: ric-plt/a1
-    project-name: ric-plt-a1
-    build-node: centos7-builder-1c-1g
+    <<: *a1_common
+    name: ric-plt-a1-verify
+    # the install script assumes an ubuntu image
+    build-node: ubuntu1804-builder-2c-2g
+    pre-build-script: !include-raw-escape:
+      - ../shell/install-deb-nng-rmr.sh
+    python-version: python3
+    stream:
+      # run verify on all branches
+      # the ANT pattern is **/{branch}, we are exploiting that.
+      - all:
+          branch: '*'
+    jobs:
+      - gerrit-tox-verify
 
+- project:
+    <<: *a1_common
+    name: ric-plt-a1-sonar
+    branch: master
+    python-version: python3
+    # the install script assumes an ubuntu image
+    build-node: ubuntu1804-builder-2c-2g
+    pre-build-script: !include-raw-escape:
+      - ../shell/install-deb-nng-rmr.sh
+    sonarcloud: true
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
     jobs:
-      - gerrit-info-yaml-verify
+      - gerrit-tox-sonar