X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-services-heartbeat.yaml;h=2bd610a4f157c74645160bbd9073e2b43922c9e9;hb=e46f9aa926bb423cb983cfdcbd9d029cd69f5301;hp=b8ff328fe74af3887b1edb3a2974d1c677e4204f;hpb=db675aa5f58e09dd22aecad59b88e60c0e320218;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
index b8ff328fe..2bd610a4f 100644
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -1,55 +1,53 @@
 ---
 - project:
     name: dcaegen2-services-heartbeat
-    project-name: 'dcaegen2-services-heartbeat'
+    project-name: "dcaegen2-services-heartbeat"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-
-    project: 'dcaegen2/services/heartbeat'
+      - "{project-name}-python-jobs":
+          pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh
+      - "{project-name}-{stream}-release-version-java-daily"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    project: "dcaegen2/services/heartbeat"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-services-heartbeat-settings'
+      - "master":
+          branch: "master"
+      - "london":
+          branch: "london"
+    mvn-settings: "dcaegen2-services-heartbeat-settings"
     # 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-docker-8c-8g'
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
+    build-timeout: 60
 
 - project:
     name: dcaegen2-services-heartbeat-sonar
     jobs:
       - gerrit-maven-sonar
-    cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
-    project: 'dcaegen2/services/heartbeat'
-    project-name: 'dcaegen2-services-heartbeat'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-heartbeat-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}"
+    build-node: ubuntu1804-docker-8c-8g
+    project: "dcaegen2/services/heartbeat"
+    project-name: "dcaegen2-services-heartbeat"
+    branch: "master"
+    mvn-settings: "dcaegen2-services-heartbeat-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: dcaegen2-services-heartbeat-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: dcaegen2/services/heartbeat
-    build-node: ubuntu1604-docker-8c-8g
-    project-name: 'dcaegen2-services-heartbeat'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-services-heartbeat-settings'
-
-- project:
-    name: dcaegen2-services-heartbeat-info
-    project-name: dcaegen2-services-heartbeat
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/services/heartbeat
-    branch: master
+    build-node: ubuntu1804-docker-8c-8g
+    project-name: "dcaegen2-services-heartbeat"
+    branch: "master"
+    mvn-settings: "dcaegen2-services-heartbeat-settings"