X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdcaegen2%2Fdcaegen2-services-heartbeat.yaml;h=5abb8461c7d9cc837e3befff4b3808696a879ec1;hb=a29dd524cc61ad4692b5ba0fee58c2276ffa0917;hp=83511be29fe416aea11d4e3323773ab540975767;hpb=b0363f629b5933b181889a72f4144a12f461a05e;p=ci-management.git

diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
index 83511be29..5abb8461c 100644
--- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml
@@ -1,66 +1,54 @@
 ---
 - 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-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-
-    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'
-      - 'guilin':
-          branch: 'guilin'
-      - 'honolulu':
-          branch: 'honolulu'
-    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: 'ubuntu1804-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
     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}"
+    cron: "@daily"
     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: "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-'
+    nexus-iq-namespace: "onap-"
     project: dcaegen2/services/heartbeat
     build-node: ubuntu1804-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
-    project: dcaegen2/services/heartbeat
-    branch: master
+    project-name: "dcaegen2-services-heartbeat"
+    branch: "master"
+    mvn-settings: "dcaegen2-services-heartbeat-settings"