Merge "[SO] Add properties for history cleanup window"

diff --git a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
index c64e105..360936d 100755 (executable)
--- a/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/resources/config/overrides/override.yaml
@@ -34,6 +34,10 @@ camunda:
     job-execution:
       max-pool-size: 30
       core-pool-size: 3
+    generic-properties:
+      properties:
+        sunday-history-cleanup-batch-window-start-time: {{ quote .Values.camunda.sundayCleanupWindowStartTime }}
+        sunday-history-cleanup-batch-window-end-time: {{ quote .Values.camunda.sundayCleanupWindowEndTime }}
 entitymanager:
   packagesToScan: com
 pnf:
@@ -113,9 +117,6 @@ mso:
       timeout: PT5M
       callback:
         endpoint: http://so-oof-adapter.{{ include "common.namespace" . }}:8090/so/adapters/oof/callback/v1
-  bpmn:
-    process:
-      historyTimeToLive: '30'
   callbackRetryAttempts: '5'
   catalog:
     db:
@@ -285,6 +286,7 @@ mso:
   naming:
     endpoint: http://naming.demo.onap.com:8081/web/service/v1/genNetworkElementName
     auth: Basic bTA0NzY4QG5vbi1wcm9kLm1zby5lY29tcC5hdHQuY29tOkF0dG0wNDc2OExpZmUhQA==
+  bpmn-history-ttl: {{ .Values.bpmn.historyTTL }}
 policy:
   auth: Basic dGVzdHBkcDphbHBoYTEyMw==
   default:

diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml
index d4333ef..92c0a61 100755 (executable)
--- a/kubernetes/so/components/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/values.yaml
@@ -66,6 +66,13 @@ secrets:
 image: onap/so/bpmn-infra:1.9.2
 pullPolicy: Always
 
+bpmn:
+  historyTTL: 14
+
+camunda:
+  sundayCleanupWindowStartTime: "04:00"
+  sundayCleanupWindowEndTime: "10:00"
+
 db:
   userName: so_user
   userPassword: so_User123