X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-utils.yaml;h=72b4e6e7abc48bd38722b6c8492121b18180d18c;hb=a29dd524cc61ad4692b5ba0fee58c2276ffa0917;hp=d91b3789cf6d9199059f34645a88890693e63f40;hpb=abf581c312d31919c36c495d791881db452002f8;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index d91b3789c..72b4e6e7a 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -1,58 +1,90 @@
 ---
 - project:
     name: dcaegen2-utils
-    project-name: 'dcaegen2-utils'
+    project-name: "dcaegen2-utils"
     python-version: python3
 
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-
-    project: 'dcaegen2/utils'
+      - 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'
-    mvn-settings: 'dcaegen2-utils-settings'
+      - "master":
+          branch: "master"
+      - "london":
+          branch: "london"
+    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
     maven-deploy-properties: |
       deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: 'ubuntu1604-builder-4c-4g'
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
 
 - project:
     name: dcaegen2-utils-sonar
     jobs:
       - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'dcaegen2/utils'
-    project-name: 'dcaegen2-utils'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-utils-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    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: 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-'
+    nexus-iq-namespace: "onap-"
+    project: dcaegen2/utils
+    build-node: ubuntu1804-docker-8c-8g
+    project-name: "dcaegen2-utils"
+    branch: "master"
+    mvn-settings: "dcaegen2-utils-settings"
+
+- _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
-    build-node: ubuntu1604-docker-8c-8g
-    project-name: 'dcaegen2-utils'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-utils-settings'
+    # 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-utils-info
-    project-name: dcaegen2-utils
+    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-info-yaml-verify
-    project: dcaegen2/utils
-    branch: master
+      - 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