From bbebd0f71ea0602e09921d284029634fa6e0c1d1 Mon Sep 17 00:00:00 2001 From: "Lott, Christopher (cl778h)" Date: Tue, 1 Oct 2019 11:58:13 -0400 Subject: [PATCH] Separate PyPI jobs due to trigger conflicts The feature lives in subdirectory src/bindings/rmr-python but the gerrit_trigger_file_paths setting overrides the release template settings. Separate the jobs as a workaround. Signed-off-by: Lott, Christopher (cl778h) Change-Id: I0968e7a18612401532d82d91e5e60d82ae648c4f --- jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) 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 934823fb..deb9be15 100644 --- a/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml +++ b/jjb/ric-plt-lib-rmr/ric-plt-lib-rmr.yaml @@ -61,4 +61,23 @@ - master: branch: master jobs: - - '{project-name}-gerrit-pypi-jobs' + - gerrit-pypi-verify + - gerrit-pypi-merge + +# Temporary workaround to avoid overriding +# gerrit_trigger_file_paths on release jobs +- project: + <<: *rmr_common + name: ric-plt-lib-rmr-python-workaround + 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 -- 2.16.6