X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-utils.yaml;h=55a5bb443d9633cad70150be2e517373eab6d8a6;hb=1305978defce5a0ed0076f5c385123efe35c0e57;hp=d91b3789cf6d9199059f34645a88890693e63f40;hpb=5f4a54e3dd6e1de4fb10a602c04841b5a87a684f;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index d91b3789c..55a5bb443 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -5,17 +5,20 @@
     python-version: python3
 
     jobs:
+      - gerrit-maven-verify:
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
-
     project: 'dcaegen2/utils'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'dcaegen2-utils-settings'
+    mvn-snapshot-id: 'ecomp-snapshots'
+    nexus-snapshot-repo: 'snapshots'
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
     # correctly defined in the job
@@ -23,14 +26,18 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    build-node: 'ubuntu1804-docker-8c-8g'
 
 - project:
     name: dcaegen2-utils-sonar
     jobs:
       - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/utils'
     project-name: 'dcaegen2-utils'
     branch: 'master'
@@ -44,7 +51,7 @@
       - gerrit-maven-clm
     nexus-iq-namespace: 'onap-'
     project: dcaegen2/utils
-    build-node: ubuntu1604-docker-8c-8g
+    build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-utils'
     branch: 'master'
     mvn-settings: 'dcaegen2-utils-settings'
@@ -54,5 +61,39 @@
     project-name: dcaegen2-utils
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
     project: dcaegen2/utils
     branch: master
+
+- cbs_client_pypi_common: &cbs_client_pypi_common
+    name: cbs-client-pypi-common
+    # jenkins job prefix
+    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: centos8-docker-4c-4g
+    tox-dir: onap-dcae-cbs-docker-client
+    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