summaryrefslogtreecommitdiffstats
path: root/jjb/dcaegen2
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2019-10-02 16:38:19 +0000
committerGerrit Code Review <gerrit@onap.org>2019-10-02 16:38:19 +0000
commita3c2953251ad9affce5ddf50f9f2dd79f0e39756 (patch)
tree2e8b78be3048e03a0e5b9fd9f65868961b3f1710 /jjb/dcaegen2
parente1eefa2f3fa609d73ba85c8f83071fb90ce9bd6c (diff)
parentc1374fb5775f1f2fc59fab007061381e8a9cb27e (diff)
Merge "Split PyPI templates for CBS docker client"
Diffstat (limited to 'jjb/dcaegen2')
-rw-r--r--jjb/dcaegen2/dcaegen2-utils.yaml30
1 files changed, 21 insertions, 9 deletions
diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 1bb89e7fd..666b2177b 100644
--- 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