[DCAE] Remove istanbul branch job

[ci-management.git] / jjb / dcaegen2 / dcaegen2-utils.yaml

diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index e53c061..4cecd41 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -5,15 +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'
+      - '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
@@ -21,14 +26,19 @@
       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-api-token: '{sonarcloud_api_token}'
+    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'
@@ -42,7 +52,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'
@@ -52,26 +62,39 @@
     project-name: dcaegen2-utils
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     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