Move sonarcloud config parameters to defaults

[ci-management.git] / jjb / ric-plt-a1 / ric-plt-a1.yaml

diff --git a/jjb/ric-plt-a1/ric-plt-a1.yaml b/jjb/ric-plt-a1/ric-plt-a1.yaml
index 2332aca..a9118ea 100644 (file)
--- a/jjb/ric-plt-a1/ric-plt-a1.yaml
+++ b/jjb/ric-plt-a1/ric-plt-a1.yaml
@@ -13,41 +13,59 @@
     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
     project-name: ric-plt-a1
     # maven settings file has docker credentials
     mvn-settings: ric-plt-a1-settings
-    stream:
-      - master:
-          branch: master
 
 - 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
+    jobs:
+      - gerrit-tox-verify
+      - gerrit-python-xc-clm
+
+- 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-docker-verify
+      - gerrit-tox-sonar