Skip to content

Commit e1044f2

Browse files
Merge pull request codefresh-io#284 from codefresh-io/mongo-db-update
Mongo db update
2 parents 2b60a0d + c48dfca commit e1044f2

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

_docs/administration/codefresh-on-prem.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ The following table displays the list of databases created as part of the instal
357357

358358
| Database | Purpose | Latest supported version |
359359
|----------|---------| ---------------|
360-
| mongoDB | storing all account data (account settings, users, projects, pipelines, builds etc.) | 3.6.x |
360+
| mongoDB | storing all account data (account settings, users, projects, pipelines, builds etc.) | 4.2.x |
361361
| postgresql | storing data about events that happened on the account (pipeline updates, deletes, etc.). The audit log uses the data from this database. | 9.6.x |
362362
| redis | mainly used for caching, but also used as a key-value store for our trigger manager. | 3.2.x |
363363

_docs/codefresh-yaml/steps/approval.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: "Approval"
3-
description: "How to pause pipelines for manual approval"
3+
description: "How to Pause Pipelines for Manual Approval"
44
group: codefresh-yaml
55
sub_group: steps
66
toc: true
@@ -36,6 +36,7 @@ step_name:
3636
timeout:
3737
duration: 2
3838
finalState: approved
39+
timeUnit: minutes
3940
when:
4041
branch:
4142
only: [ master ]
@@ -50,13 +51,15 @@ step_name:
5051
| ------------------------------------------ | ---------------------------------------------- | ------------------------- |
5152
| `title` | The free-text display name of the step. | Optional |
5253
| `description` | A basic, free-text description of the step. | Optional |
53-
| `timeout` | Defines an automatic approval/rejection if a specified amount of time has passed. The `duration` field is hours. By default it is set to 168 (i.e. 7 days). The `finalState` field defines what will happen after the duration time has elapsed. Possible values are `approved`/`denied`/`terminated` | Optional |
54+
| `timeout` | Defines an automatic approval/rejection if a specified amount of time has passed. The `duration` field is hours. By default it is set to 168 (i.e.
55+
, 7 days). The `finalState` field defines what will happen after the duration time has elapsed. Possible values are `approved`/`denied`/`terminated` | Optional |
56+
| `timeUnit` | This field defines possible options of `minutes`, or `hours`. If the field is not set, the default is `hours` | Optional
5457
| `fail_fast` | If set to false, the pipeline will continue even when the step is rejected | Optional |
5558
| `stage` | Parent group of this step. See [using stages]({{site.baseurl}}/docs/codefresh-yaml/stages/) for more information. | Optional |
5659
| `when` | Define a set of conditions that need to be satisfied in order to execute this step. You can find more information in the [Conditional Execution of Steps]({{site.baseurl}}/docs/codefresh-yaml/conditional-execution-of-steps/) article. | Optional |
5760

5861

59-
## Pausing the pipeline
62+
## Pausing the Pipeline
6063

6164
Once the pipeline reaches an approval step it will stop. At this point it **does not** consume any resources.
6265
In the Codefresh UI you will see the *Approve/Reject* buttons.
@@ -74,7 +77,7 @@ max-width="80%"
7477
Once you click any of them the pipeline will continue. Further steps in the pipeline can be enabled/disabled
7578
according to the approval result.
7679

77-
## Automatic approvals/rejections
80+
## Automatic Approvals/Rejections
7881

7982
By default, a pipeline that contains an approval step will pause for 7 days (168 hours) onces it reaches that step. If you want some automatic action to happen after a specified time period you can define it in advance with the `timeout` property:
8083

@@ -127,7 +130,7 @@ max-width="80%"
127130

128131
For more details on access control and users see also the [access control page]({{site.baseurl}}/docs/administration/access-control/).
129132

130-
## Keeping the shared volume after an approval
133+
## Keeping the Shared Volume after an Approval
131134

132135
As soon as a pipeline starts waiting for an approval, all contents of the [shared Codefresh volume]({{site.baseurl}}/docs/configure-ci-cd-pipeline/introduction-to-codefresh-pipelines/#sharing-the-workspace-between-build-steps) are lost. Once the pipeline continues running all files that were created manually inside the volume are not available any more.
133136

@@ -150,7 +153,7 @@ max-width="90%"
150153
>Notice also that you if you use the [Hybrid version]({{site.baseurl}}/docs/administration/behind-the-firewall/) of Codefresh and your [Runner]({{site.baseurl}}/docs/administration/codefresh-runner/) is setup with local volumes, then the volume will only be present if the dind pod
151154
is scheduled in the same node once the pipeline resumes. Otherwise the volume will not be reused.
152155

153-
## Controlling the rejection behavior
156+
## Controlling the Rejection Behavior
154157

155158
By default if you reject a pipeline, it will stop right away and it will be marked as failed. All subsequent steps after the approval one will not run at all.
156159

@@ -171,7 +174,7 @@ steps:
171174
In this case you can also read the approval result and make the pipeline work differently according to each choice (demonstrated in the following section).
172175

173176

174-
## Getting the approval result
177+
## Getting the Approval Result
175178

176179
As also explained in [step dependencies]({{site.baseurl}}/docs/codefresh-yaml/advanced-workflows/#custom-steps-dependencies) all steps in the Codefresh pipeline belong to a global object
177180
called `steps` (indexed by name). You can read the `result` property for an approval step to see if it was approved or rejected.
@@ -291,7 +294,7 @@ max-width="80%"
291294
You can see that only two steps were ignored. If you rerun the pipeline and approve
292295
it, the other two steps will be ignored.
293296

294-
## Define concurrency limits
297+
## Define Concurrency Limits
295298

296299
Codefresh has the ability to limit the amount of running builds for a specific pipeline with several concurrency policies in the pipeline settings. You can choose if a build that is in a pending approval state will count against the concurrency limits or not.
297300

@@ -305,7 +308,7 @@ There isn't a correct or wrong way to set this option. It depends on your organi
305308
You can either set this option [differently per pipeline]({{site.baseurl}}/docs/configure-ci-cd-pipeline/pipelines/#policies), or globally in your account at your [account settings](https://g.codefresh.io/account-admin/account-conf/pipeline-settings).
306309

307310

308-
## Slack integration
311+
## Slack Integration
309312

310313
If you also enable [Slack integration]({{site.baseurl}}/docs/integrations/notifications/slack-integration/) in Codefresh you will have the choice of approving/rejecting a pipeline
311314
via a Slack channel

0 commit comments

Comments
 (0)