diff --git a/.github/workflows/.merge.yml b/.github/workflows/.merge.yml index 20c759c..e624c16 100644 --- a/.github/workflows/.merge.yml +++ b/.github/workflows/.merge.yml @@ -4,9 +4,6 @@ on: pull_request: branches: [dev] types: [closed] - push: - branches: "*" - # temp change to force a deployment workflow_dispatch: concurrency: diff --git a/containers/db_cleanup/cleanup.js b/containers/db_cleanup/cleanup.js index bba5db9..94609f3 100644 --- a/containers/db_cleanup/cleanup.js +++ b/containers/db_cleanup/cleanup.js @@ -124,8 +124,8 @@ function delete_entries() { () => { vhersClient.end(); pinClient.end(); - sleep(240000).then(() => {console.log(`Successfully deleted audit log entries prior to ${retainUntilString}`); - process.exit(0);}) + console.log(`Successfully deleted audit log entries prior to ${retainUntilString}`); + process.exit(0); }, (err) => { console.log(err); diff --git a/containers/db_cleanup/openshift/templates/db-cleanup-dc.yaml b/containers/db_cleanup/openshift/templates/db-cleanup-dc.yaml index 8750f28..d7955d8 100644 --- a/containers/db_cleanup/openshift/templates/db-cleanup-dc.yaml +++ b/containers/db_cleanup/openshift/templates/db-cleanup-dc.yaml @@ -68,9 +68,9 @@ objects: metadata: name: db-cleanup-cronjob spec: - # schedule: "30 2 * * SUN" + schedule: "30 2 * * SUN" # Different schedule for test purposes - schedule: "*/5 * * * *" + # schedule: "*/5 * * * *" startingDeadlineSeconds: 200 concurrencyPolicy: Forbid successfulJobsHistoryLimit: 3