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=1e8511f1ce234a6891353c86e2948851cb5d50e3;hpb=341484441f35b450593026a229796b0c4f9613bc;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 1e8511f1..aa830961 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,44 +24,49 @@
     mvn-settings: ric-plt-a1-settings
 
 - project:
-    <<: *a1_docker_common
+    <<: *a1_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
+    # use host network
     docker-build-args: '--network=host'
+    build-node: ubuntu1804-docker-4c-4g
     stream:
       - master:
           branch: master
     jobs:
-      - gerrit-python-xc-clm
       - '{project-name}-gerrit-docker-jobs'
 
-# runs unit tests on verify only
 - project:
-    <<: *a1_docker_common
-    name: ric-plt-a1-test
-    project-name: ric-plt-a1-test
-    # image name, but is never pushed
-    docker-name: '{name}'
-    # source of docker tag
-    container-tag-method: latest
-    docker-build-args: '-f Dockerfile-Unit-Test'
+    <<: *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-docker-verify
+      - gerrit-tox-verify
 
 - project:
-    <<: *a1_docker_common
+    <<: *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-project-key: o-ran-sc_ric-plt-a1
-    sonarcloud-project-organization: o-ran-sc
-    sonarcloud-api-token: d9e23c28dc39b6d7531d2ecabf122ce84e6253ef
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
     jobs:
       - gerrit-tox-sonar