From 2b4af49325c200992f958f7136a33766aa9e3956 Mon Sep 17 00:00:00 2001 From: Jacopo De Amicis Date: Tue, 6 Feb 2024 00:21:07 +0100 Subject: [PATCH] Fix failing unit tests and cookstyle linter Add ExternalSlurmdbd subsection in unit tests for the generation of the Slurm configuration. Signed-off-by: Jacopo De Amicis --- .../recipes/config/config_slurm_accounting.rb | 1 - .../test_generate_partition_nodelist_mapping/sample_input.yaml | 1 + .../sample_input.yaml | 1 + .../cluster_config.yaml | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cookbooks/aws-parallelcluster-slurm/recipes/config/config_slurm_accounting.rb b/cookbooks/aws-parallelcluster-slurm/recipes/config/config_slurm_accounting.rb index c7c01f236..89f24abfc 100644 --- a/cookbooks/aws-parallelcluster-slurm/recipes/config/config_slurm_accounting.rb +++ b/cookbooks/aws-parallelcluster-slurm/recipes/config/config_slurm_accounting.rb @@ -15,7 +15,6 @@ # OR CONDITIONS OF ANY KIND, express or implied. See the License for the specific language governing permissions and # limitations under the License. - template '/etc/systemd/system/slurmdbd.service' do source 'slurm/head_node/slurmdbd.service.erb' owner 'root' diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_partition_nodelist_mapping/sample_input.yaml b/test/unit/slurm/test_slurm_config_generator/test_generate_partition_nodelist_mapping/sample_input.yaml index 6e00c43b1..64a463321 100644 --- a/test/unit/slurm/test_slurm_config_generator/test_generate_partition_nodelist_mapping/sample_input.yaml +++ b/test/unit/slurm/test_slurm_config_generator/test_generate_partition_nodelist_mapping/sample_input.yaml @@ -4,6 +4,7 @@ Scheduling: ScaledownIdletime: 10 EnableMemoryBasedScheduling: false Database: null + ExternalSlurmdbd: null SlurmQueues: - Name: queue1 ComputeResources: diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_custom_settings/sample_input.yaml b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_custom_settings/sample_input.yaml index 3c53bea22..5c9b89c7b 100644 --- a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_custom_settings/sample_input.yaml +++ b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_custom_settings/sample_input.yaml @@ -88,3 +88,4 @@ Scheduling: ScaledownIdletime: 10 EnableMemoryBasedScheduling: false Database: null + ExternalSlurmdbd: null diff --git a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_job_exc_alloc/cluster_config.yaml b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_job_exc_alloc/cluster_config.yaml index da3f30c20..5eeb23f17 100644 --- a/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_job_exc_alloc/cluster_config.yaml +++ b/test/unit/slurm/test_slurm_config_generator/test_generate_slurm_config_with_job_exc_alloc/cluster_config.yaml @@ -34,3 +34,4 @@ Scheduling: ScaledownIdletime: 10 EnableMemoryBasedScheduling: false Database: null + ExternalSlurmdbd: null