X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-utils.yaml;h=f315401d40037ab33a967d93788d1841e8510df1;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=4cecd41da0b46a32c831c9ad259ea799e26e529d;hpb=2f42ab9471e3cc478dd6eccd9b9dbce4ca9b15fe;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml
index 4cecd41da..f315401d4 100644
--- a/jjb/dcaegen2/dcaegen2-utils.yaml
+++ b/jjb/dcaegen2/dcaegen2-utils.yaml
@@ -1,72 +1,61 @@
 ---
 - project:
     name: dcaegen2-utils
-    project-name: 'dcaegen2-utils'
+    project-name: "dcaegen2-utils"
     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'
+      - "{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'
+      - "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: 'ubuntu1804-docker-8c-8g'
+    files: "**"
+    archive-artifacts: ""
+    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'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
     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: "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'
+    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
+- _cbs_client_pypi_common: &cbs_client_pypi_common
     name: cbs-client-pypi-common
     # jenkins job prefix
     project-name: dcaegen2-platform-cbs-client
@@ -75,7 +64,7 @@
     # push credentials
     mvn-settings: dcaegen2-utils-settings
     # requires centos to sign release
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-docker-4c-4g
     tox-dir: onap-dcae-cbs-docker-client
     stream:
       - master:
@@ -86,7 +75,7 @@
     <<: *cbs_client_pypi_common
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'onap-dcae-cbs-docker-client/{name}/.*'
+        pattern: "onap-dcae-cbs-docker-client/{name}/.*"
     jobs:
       - gerrit-pypi-verify
       - gerrit-pypi-merge: