Fix bad build-node definition

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

diff --git a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
index aa7bcdc..ca077ed 100644 (file)
--- a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
+++ b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
@@ -43,11 +43,11 @@
       - master:
           branch: master
 
-# build and publish distributions to PyPI
+# build and publish distributions to test.pypi.org
 - project:
     <<: *rmr_common
-    name: ric-plt-lib-rmr-python
-    project-name: '{name}'
+    name: ric-plt-lib-rmr-python-pypi
+    project-name: ric-plt-lib-rmr-python
     # sigul requires centos
     build-node: centos7-builder-1c-1g
     # install prereqs
@@ -61,24 +61,32 @@
       - master:
           branch: master
     jobs:
-      - gerrit-pypi-verify
-      - gerrit-pypi-merge:
-          pypi-repo: pypi-test
+      - '{project-name}-gerrit-pypi-jobs'
 
-# Temporary workaround to avoid overriding
-# gerrit_trigger_file_paths on release jobs
+# promote distributions from test to pypi.org
 - project:
     <<: *rmr_common
-    name: ric-plt-lib-rmr-python-workaround
+    name: ric-plt-lib-rmr-python-pypi-release
     project-name: ric-plt-lib-rmr-python
     # sigul requires centos
     build-node: centos7-builder-1c-1g
+    jobs:
+      - '{project-name}-gerrit-pypi-release-jobs'
+
+- project:
+    <<: *rmr_common
+    name: ric-plt-lib-rmr-python-sonar
+    project-name: ric-plt-lib-rmr-python
+    branch: master
+    python-version: python3
+    # the pre-build-script installs debian packages
+    build-node: ubuntu1804-builder-2c-2g
     # install prereqs
-    pre-build-script: !include-raw-escape: ../shell/install-rpm-nng-rmr.sh
+    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}'
     tox-dir: src/bindings/rmr-python
-    stream:
-      - master:
-          branch: master
     jobs:
-      - gerrit-pypi-release-verify
-      - gerrit-pypi-release-merge
+      - gerrit-tox-sonar