X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fric-plt-lib-rmr%2Fric-plt-lib-rmr.yaml;h=0c728688eb432e7937f20b8359eb40cd26e37803;hb=refs%2Fchanges%2F79%2F1479%2F1;hp=1571395620a995bb6d21761e632527b9d571e7cb;hpb=0e052110512ee08ddf758ffff00aab68bba263b5;p=ci-management.git

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 15713956..0c728688 100644
--- a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
+++ b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml
@@ -40,14 +40,15 @@
       - gerrit-docker-verify
       - oran-gerrit-docker-ci-pc-merge
     stream:
-      - master:
-          branch: master
+      # verify and push from all branches
+      - all:
+          branch: '*'
 
-# 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
@@ -58,30 +59,21 @@
       - compare-type: REG_EXP
         pattern: 'src/bindings/rmr-python/.*'
     stream:
-      - master:
-          branch: master
+      # verify and push from all branches
+      - all:
+          branch: '*'
     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
-    # install prereqs
-    pre-build-script: !include-raw-escape: ../shell/install-rpm-nng-rmr.sh
-    tox-dir: src/bindings/rmr-python
-    stream:
-      - master:
-          branch: master
     jobs:
-      - gerrit-pypi-release-verify
-      - gerrit-pypi-release-merge
+      - '{project-name}-gerrit-pypi-release-jobs'
 
 - project:
     <<: *rmr_common
@@ -90,7 +82,7 @@
     branch: master
     python-version: python3
     # the pre-build-script installs debian packages
-    build-node: ubuntu1804-builder-2c-2ga
+    build-node: ubuntu1804-builder-2c-2g
     # install prereqs
     pre-build-script: !include-raw-escape: ../shell/install-deb-nng-rmr.sh
     sonarcloud: true