From ea8a2bd9931dda1130cfc0238ef8f10325175c87 Mon Sep 17 00:00:00 2001 From: Laurent Rochette Date: Tue, 25 Oct 2022 09:48:38 -0700 Subject: [PATCH 1/2] Adding hybrid runner example --- examples/pipelines/main.tf | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/examples/pipelines/main.tf b/examples/pipelines/main.tf index 0141f5f7..2fcb99dd 100644 --- a/examples/pipelines/main.tf +++ b/examples/pipelines/main.tf @@ -64,6 +64,13 @@ steps: "context2-name", ] + # hybrid runner example + runtime_environment { + name = "csdp/runner" + cpu = "1500" # for 1.5 CPU + memory = "500" # in Mi + } + trigger { branch_regex = "/.*/gi" context = "git" @@ -99,4 +106,4 @@ steps: ANOTHER_PIP_VAR = "another_value" } } -} \ No newline at end of file +} From 7b83ccf62e8b2d53fbbd89fcf5bcbc0766ce0741 Mon Sep 17 00:00:00 2001 From: Laurent Rochette Date: Tue, 25 Oct 2022 09:53:20 -0700 Subject: [PATCH 2/2] Add units for resource requests --- docs/resources/pipeline.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/resources/pipeline.md b/docs/resources/pipeline.md index 20af54dc..c2e379bf 100644 --- a/docs/resources/pipeline.md +++ b/docs/resources/pipeline.md @@ -149,8 +149,8 @@ resource "codefresh_pipeline" "test" { `runtime_environment` supports the following: - `name` - (Required) A name of runtime. -- `cpu` - (Optional) A required amount of CPU. -- `memory` - (Optional) A required amount of memory. +- `cpu` - (Optional) A required amount of CPU in millicpu (m). +- `memory` - (Optional) A required amount of memory in mebibytes (Mi). - `dind_storage` - (Optional) A pipeline shared storage. ---