Split PyPI templates for CBS docker client

This module is in a subdirectory, so must specify a gerrit trigger
file path to test this module and package it into a distribution for
upload to PyPI.  But that parameter breaks the release verify and
merge jobs. Work around the problem by using two project defs.
Also configure the non-release merge job with repo key pypy-test.

Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
Issue-ID: DCAEGEN2-1729
Change-Id: I5ab67a95d7e3f40cd2241ef69ea22bf0f9ce9b7f

diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 1bb89e7..666b217 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -55,23 +55,35 @@
     project: dcaegen2/utils
     branch: master
 
-- project:
-    name: dcaegen2-platform-cbs-client
+- cbs_client_pypi_common: &cbs_client_pypi_common
+    name: cbs-client-pypi-common
     # jenkins job prefix
-    project-name: '{name}'
+    project-name: dcaegen2-platform-cbs-client
     # git repo
     project: dcaegen2/utils
     # push credentials
     mvn-settings: dcaegen2-utils-settings
     # requires centos to sign release
     build-node: centos7-builder-2c-1g
-    # subdirectory
-    gerrit_trigger_file_paths:
-      - compare-type: REG_EXP
-        pattern: 'onap-dcae-cbs-docker-client/{name}/.*'
     tox-dir: onap-dcae-cbs-docker-client
-    jobs:
-      - '{project-name}-gerrit-pypi-jobs'
     stream:
       - master:
           branch: master
+
+- project:
+    name: dcaegen2-platform-cbs-client-pypi-build
+    <<: *cbs_client_pypi_common
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: 'onap-dcae-cbs-docker-client/{name}/.*'
+    jobs:
+      - gerrit-pypi-verify
+      - gerrit-pypi-merge:
+          pypi-repo: pypi-test
+
+- project:
+    name: dcaegen2-platform-cbs-client-pypi-release
+    <<: *cbs_client_pypi_common
+    jobs:
+      - gerrit-pypi-release-verify
+      - gerrit-pypi-release-merge