Skip to content

Commit a5d6e8d

Browse files
dreambeyondorangehanwen-pcluste
authored andcommitted
Fix system test config for efa, remove duplicate test in intel_mpi, tag ptrace control with 'config'
1 parent dec56c0 commit a5d6e8d

File tree

4 files changed

+4
-14
lines changed

4 files changed

+4
-14
lines changed

kitchen.resources-config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ suites:
3030
- recipe[aws-parallelcluster-common::test_resource]
3131
verifier:
3232
controls:
33-
- efa_debian_system_settings_configured
33+
- tag:config_efa_debian_system_settings_configured
3434
attributes:
3535
resource: efa:configure
3636
cluster:
@@ -44,7 +44,7 @@ suites:
4444
- recipe[aws-parallelcluster-common::test_resource]
4545
verifier:
4646
controls:
47-
- efa_debian_system_settings_configured
47+
- tag:config_efa_debian_system_settings_configured
4848
attributes:
4949
resource: efa:configure
5050
cluster:

kitchen.validate-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ _common_cluster_attributes: &_common_cluster_attributes
1717
custom_node_package: <%= ENV['PARALLELCLUSTER_NODE_URL'] %>
1818
dcv_enabled: 'head_node'
1919
dcv_port: '8443'
20-
enable_efa: 'compute'
20+
enable_efa: 'efa'
2121
nvidia:
2222
enabled: <%= ENV['NVIDIA_ENABLED'] %>
2323

test/recipes/controls/aws_parallelcluster_install/intel_mpi_spec.rb

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,3 @@
2121
its('stdout') { should match(/Version #{node['cluster']['intelmpi']['version'].split('.')[0..1].join(".")}/) }
2222
end
2323
end
24-
25-
control 'tag:config_intel_mpi_ptrace_protection_configured_on_ubuntu1804' do
26-
only_if { node['conditions']['intel_mpi_supported'] && os_properties.ubuntu1804? }
27-
28-
ptrace_scope = instance.head_node? ? 1 : 0
29-
describe 'check ptrace protection enabled' do
30-
subject { bash("sudo -u #{node['cluster']['cluster_user']} sysctl kernel.yama.ptrace_scope") }
31-
its('stdout') { should match /kernel.yama.ptrace_scope = #{ptrace_scope}/ }
32-
end
33-
end

test/resources/controls/aws_parallelcluster_config/efa_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
control 'efa_debian_system_settings_configured' do
1+
control 'tag:config_efa_debian_system_settings_configured' do
22
title 'Check debian system is correctly configured for EFA'
33

44
only_if { os.debian? && !os_properties.virtualized? }

0 commit comments

Comments
 (0)