X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fric-plt-a1%2Fric-plt-a1.yaml;h=d4f5ade138a13cd921572c539720553176f17b3c;hb=792ff5015586df977c537b2ef281f5f703c2b875;hp=e8e5fecf90094885030318fa44fdec0793f0ec65;hpb=bde567d29b9b36e055f417491e6f4bbdd745968a;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 e8e5fecf..d4f5ade1 100644
--- a/jjb/ric-plt-a1/ric-plt-a1.yaml
+++ b/jjb/ric-plt-a1/ric-plt-a1.yaml
@@ -13,9 +13,9 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- a1_docker_common: &a1_docker_common
-    # values apply to all A1 docker projects
-    name: a1-docker-common
+- a1_common: &a1_common
+    # values apply to all A1 projects
+    name: a1-common
     # git repo
     project: ric-plt/a1
     # jenkins job name prefix
@@ -24,39 +24,71 @@
     mvn-settings: ric-plt-a1-settings
 
 - project:
-    <<: *a1_docker_common
-    name: ric-plt-a1
+    <<: *a1_common
+    name: ric-plt-a1-docker
     # image name
-    docker-name: '{name}'
+    docker-name: 'o-ran-sc/ric-plt-a1'
     # source of docker tag
     container-tag-method: yaml-file
-    # use host network to clone from our gerrit
+    # use host network
     docker-build-args: '--network=host'
+    build-node: ubuntu1804-docker-4c-4g
+    stream:
+      - master:
+          branch: master
+    jobs:
+      - '{project-name}-gerrit-docker-jobs'
+
+- project:
+    <<: *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:
-      - master:
-          branch: master
+      # run verify on all branches
+      # the ANT pattern is **/{branch}, we are exploiting that.
+      - all:
+          branch: '*'
     jobs:
       - gerrit-tox-verify
-      - '{project-name}-gerrit-docker-jobs'
+
+- project:
+    <<: *a1_common
+    name: ric-plt-a1-nexusiq-clm
+    build-node: centos7-builder-1c-1g
+    nexus-iq-namespace: oran-
+    jobs:
       - gerrit-python-xc-clm
 
 - project:
-    <<: *a1_docker_common
-    name: ric-plt-a1-sonar
-    branch: master
+    <<: *a1_common
+    name: ric-plt-a1-sonarqube
     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-project-key: o-ran-sc_ric-plt-a1
-    sonarcloud-project-organization: o-ran-sc
-    sonarcloud-api-token: d9e23c28dc39b6d7531d2ecabf122ce84e6253ef
+    sonar-project-file: ""
+    sonar-properties: |
+        sonar.login={sonarcloud_api_token}
+        sonar.projectKey={sonarcloud_project_organization}_{project-name}
+        sonar.projectName={project-name}
+        sonar.organization={sonarcloud_project_organization}
+        sonar.build.sourceEncoding=UTF-8
+        sonar.sources=a1
+        sonar.python.coverage.reportPaths=coverage.xml
+    jobs:
+      - gerrit-tox-sonarqube
+
+- project:
+    <<: *a1_common
+    name: ric-plt-a1-release
+    branch: master
+    # maven release requires sigul which requires centos
+    # container release requires docker
+    build-node: centos7-docker-2c-8g
     jobs:
-      - gerrit-tox-sonar
+      - '{project-name}-gerrit-release-jobs'