Skip to content

Commit 556fbef

Browse files
committed
chore(master): merge maint-0.9 (#304)
ci(runners): upgrade CI runners to Ubuntu 22.04 (#294) feat(cwl_reana): pass K8s requests/limits to job controller (#292)
2 parents a565875 + d308fd5 commit 556fbef

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

AUTHORS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ The list of contributors in alphabetical order:
44

55
- [Adelina Lintuluoto](https://orcid.org/0000-0002-0726-1452)
66
- [Agisilaos Kounelis](https://orcid.org/0000-0001-9312-3189)
7+
- [Alp Tuna](https://orcid.org/0009-0001-1915-3993)
78
- [Anton Khodak](https://orcid.org/0000-0003-3263-4553)
89
- [Audrius Mecionis](https://orcid.org/0000-0002-3759-1663)
910
- [Cameron McClymont](https://orcid.org/0009-0002-0176-5251)

reana_workflow_engine_cwl/cwl_reana.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22
#
33
# This file is part of REANA.
4-
# Copyright (C) 2018, 2019, 2020, 2021, 2022 CERN.
4+
# Copyright (C) 2018, 2019, 2020, 2021, 2022, 2025 CERN.
55
#
66
# REANA is free software; you can redistribute it and/or modify it
77
# under the terms of the MIT License; see LICENSE file for more details.
@@ -268,6 +268,9 @@ def shouldquote(x):
268268
slurm_partition = self._get_hint("slurm_partition")
269269
slurm_time = self._get_hint("slurm_time")
270270
kubernetes_uid = self._get_hint("kubernetes_uid")
271+
kubernetes_cpu_request = self._get_hint("kubernetes_cpu_request")
272+
kubernetes_cpu_limit = self._get_hint("kubernetes_cpu_limit")
273+
kubernetes_memory_request = self._get_hint("kubernetes_memory_request")
271274
kubernetes_memory_limit = self._get_hint("kubernetes_memory_limit")
272275
kubernetes_job_timeout = self._get_hint("kubernetes_job_timeout")
273276
c4p_cpu_cores = self._get_hint("c4p_cpu_cores")
@@ -289,6 +292,9 @@ def shouldquote(x):
289292
"htcondor_max_runtime": htcondor_max_runtime,
290293
"htcondor_accounting_group": htcondor_accounting_group,
291294
"kubernetes_uid": kubernetes_uid,
295+
"kubernetes_cpu_request": kubernetes_cpu_request,
296+
"kubernetes_cpu_limit": kubernetes_cpu_limit,
297+
"kubernetes_memory_request": kubernetes_memory_request,
292298
"kubernetes_memory_limit": kubernetes_memory_limit,
293299
"kubernetes_job_timeout": kubernetes_job_timeout,
294300
"slurm_partition": slurm_partition,

0 commit comments

Comments
 (0)