X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-utils.yaml;h=0b177225212e92dc14a28eadc92df0f9f0e63a8f;hb=6633c8385873029713b06369e04694e07e86e607;hp=25da4759cc20bd9c2f028fa2bf1016ea61a29a4f;hpb=c9d4227f41ac7e94282ac807a1da92d7629bfbbd;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 25da4759c..4cecd41da 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -3,36 +3,22 @@
     name: dcaegen2-utils
     project-name: 'dcaegen2-utils'
     python-version: python3
-    subproject:
-      - 'dcaeapplib':
-          tox-dir: dcaeapplib/
-          tox-envs: ''
-      - 'onap-dcae-cbs-docker-client':
-          tox-dir: onap-dcae-cbs-docker-client/
-          tox-envs: ''
-      - 'onap-dcae-dcaepolicy-lib':
-          tox-dir: onap-dcae-dcaepolicy-lib/
-          tox-envs: ''
-      - 'python-discovery-client':
-          tox-dir: python-discovery-client/
-          tox-envs: ''
-      - 'python-dockering':
-          tox-dir: python-dockering/
-          tox-envs: ''
 
     jobs:
-      - gerrit-maven-clm
+      - 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-name}-{subproject}-python-staging-{stream}'
-      - '{project-name}-{subproject}-python-release-{stream}'
-
     project: 'dcaegen2/utils'
     stream:
       - 'master':
           branch: 'master'
+      - 'jakarta':
+          branch: 'jakarta'
     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
@@ -40,16 +26,75 @@
       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
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-builder-4c-4g
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
+    cron: '@daily'
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/utils'
     project-name: 'dcaegen2-utils'
     branch: 'master'
     mvn-settings: 'dcaegen2-utils-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dcaegen2-utils-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: 'onap-'
+    project: dcaegen2/utils
+    build-node: ubuntu1804-docker-8c-8g
+    project-name: 'dcaegen2-utils'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-utils-settings'
+
+- project:
+    name: dcaegen2-utils-info
+    project-name: dcaegen2-utils
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-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: centos7-builder-2c-1g
+    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